How to use GIT

Git

If you don't known GIT tool, and you have some time, you have the official documentation which is http://git- scm.com/doc

Commit message

About commit message, there is a tip to close issue with the commit message itself. This tip is explain in this link: https://help.github.com/articles/closing-issues-via-commit-messages/

Rebase command

Or, if you have already worked with CVS or SVN, an important feature in git is the command rebase. With old tools, when 2 persons who work together need to merge their work. The merge could means some conflicts more or less difficult to resolve.

• With merge command, you will resolve all conflicts in same time with the HEAD of both branch.

• With rebase command, you will resolve conflicts commit after commit, and as your commits are smaller than your branch, Git could probably resolve it itself. In other words, with git rebase, conflict is smaller and easier to resolve. Another advantage of rebase command is to have a linear history, which is useful to find which commit have created the regression by dichotomy.

So with linux, or with a "git Bash" under windows. You can use this commands:

git stash # only if have some work not committed
git fetch # Refresh you local database
git rebase origin/master master # Resynchronize your local tag
git rebase master YOUR_BRANCH # Follow git instructions

# when you have a conflit:
#  - resolve it with your editor
#  - git add your_file_resolved
#  - git rebase --continue

# At the end, when the rebase is done.
git stash pop

About git rebase : http://git-scm.com/docs/git-rebase