Page History

...

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 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 git push origin master

...

Tag new release

To create a new release from the current version of the local repository and push it upstream do:

git tag -a v1.4 -m "my version 1.4"
git push v1.4