Home

libfacerec wiki

branches

• [libfacerec 1.0](libfacerec 1.0)

general

avoiding git merge conflicts

This is just a note to myself to avoid the git merge conflicts, because I don't want to fill the commit history with these useless commits. This can be done by performing a rebase before pushing changes into the repository. See http://git-scm.com/book/en/Git-Branching-Rebasing.

In practice, your workflow then should look something like this:

[write your code]
[commit locally]
git pull --rebase
git push