...
Finally, Git Best Practices is an excellent page with tons of information, overview and links to other good resources about best-practice usage of git.
Git Merge Strategies
Git has many "strategies" you can use while merging. Read the following carefully:
...