Page History

...

git fetch origin 
git rebase -p origin

if

...

If the local commits and the commits from upstream will modify the same line in the same file, this will result in a merge conflict.

This conflict can be resolved in two different ways:

1. 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.

2. Resolving the merge conflict manually
   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 file is edited and

change file locally and commit changes

...