-
Notifications
You must be signed in to change notification settings - Fork 3
Rebase
Nicolas Jourdan edited this page Nov 13, 2018
·
1 revision
Sometimes you have to rebase your branch because a PR was merged on develop and you want this development.
You already started your own development for a new feature and the branch that your are working on is based on an previous version of develop.
Don't worry it's easy !
git rebase upstream/develop
After this command there are 2 possibilities:
- The rebase was successfully completed
- An error was occurred during the rebase
In the first case everything is done, you can continue to realize your development.
In the second case there is a conflict with your job.
Run git rebase --abort and call to Florian or Nicolas.