Page History
...
The conflict can be resolved by ignoring the local changes and using the version of the file from upstream
Code Block language bash theme Emacs git rebase --skip
This will overwrite your local changes with the upstream changes.
Resolving the merge conflict manually
file is edited and
The command "git diff" will show the lines that were changed locally and by the upstream version. This file can now be added to keep whatever part of the local or remote change you want.
After the
...
merge conflict is resolved commit changes
Code Block language bash theme Emacs git
...
commit -a -
...
m "commit message"And then continue with the rebase and push everything upstream
Code Block language bash theme Emacs git rebase --continue
...
More information https://www.derekgourlay.com/blog/git-when-to-merge-vs-when-to-rebase/
git push origin
...
master
Overview
Content Tools