-
Notifications
You must be signed in to change notification settings - Fork 144
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove system include in gcc/rust/typecheck/rust-hir-type-check.h
#2924
Remove system include in gcc/rust/typecheck/rust-hir-type-check.h
#2924
Conversation
4535df2
to
cef07b5
Compare
@SIGMazer thanks for the PR :D the changelog in your second commit message needs to appear in the first one too - each commit should contain such a changelog entry. I would suggest squashing them together as one commit |
05472d4
to
f752320
Compare
@SIGMazer do you need help fixing the failing CI steps? |
0915824
to
6e38f55
Compare
|
@SIGMazer the best thing would be to resolve the conflict outside of github, with the tool you use for git (git command line or gitgui, or maybe gitkraken etc). you should "fetch" the upstream master branch, and rebase your branch on that - this will create a conflict, which you can solve. then you'll finish your rebase and your commit will have the right changelog and won't have any conflicts. Checkout the first answer here: https://stackoverflow.com/questions/7244321/how-do-i-update-or-sync-a-forked-repository-on-github |
479078c
to
49721d2
Compare
@SIGMazer Could you please add the changes to the changelog in your commit message ? |
@P-E-P changelog is already in the commit message. |
Yes but it is empty. The commiter is supposed to fill the changelog lines with the changes applied to the mentioned file.
I know this seems kinda useless and even repetitive on a small commit like this but changelogs are processed later in a changelog file independently from their commit. On a side note the commit message does not seems to match the commit content ? You're mentioning |
At the first i've deleted form |
49721d2
to
cfdea3b
Compare
gcc/rust/ChangeLog: * rust-system.h: Add system include <stack> Signed-off-by: SIGMazer <mazinasd7@gmail.com>
cfdea3b
to
91842a8
Compare
@P-E-P I edited the commit message and added change log |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you!
issue #2920
move system include to
rust-system.h