Put up to date your branch with master

[Miguel Moquillon]

Hi,

These are some recommendations about how to put up to date your branches in Git with the Silverpeas master.

In order to keep readable the historic of the changes in the repositories in GitHub, we strongly suggest you to synchronize your

branches with the master by using the rebase command instead of the usual pull.

Indeed, by using pull, you introduces disruptive points into the historic in the form of branching and merges among your own commits

and these make difficult it to read once your pull request is merged into the Silverpeas repository.

So, please, use these following commands to synchronize your branch with the Silverpeas master:

$ git checkout master

$ git pull silverpeas master (where silverpeas is the name of the remote Silverpeas repository)

$ git push origin master

$ git checkout <my branch>

$ git rebase master

$ git push origin <my branch> or git push -f origin <my branch> in the case you've done one or more sync before

In the case you encounter some conflicts, just resolve them and then:

$ git add <file 1> <file 2> ... where <file 1>, ... are the files having had conflicts

$ git rebase --continue 

Regards,

Miguel Moquillon