...
Another good resource is Think Like A Git, a site who's main page states "Git shouldn't be so hard to learn."
Finally, Git for Computer Scientists is an in depth explanation of how git works.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:
...