Why after git rebase should do : “git add changedfile”?
More explanation for my Question:
-
add command taking file to staging not commit him
-
What git rebase –continue doing?
Thanks
Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
If Git is telling you to type
git rebase --continue, it’s because the rebase isn’t finishing. It sounds like you’re stopping mid-rebase because of one or more conflicted files.When you are in a conflicted state, you can type
git statusand look for “Unmerged paths” and files marked as “both modified”:Git is asking you to manually resolve the conflicted file, remove the change markers, and then
git add <file>to mark the conflict resolved. This moves the changes into the staging area, telling Git to include them in the rebased commit which it will generate when the rebase continues.Once you’ve done this, you can continue rebasing with
git rebase --continue.