New posts in Branching And Merging

Git update branch to master

Git rebase local vs git pull --rebase origin

Git shows no merge conflicts when it should

"This branch is 1 commit ahead, 1 commit behind master" in Github while using "A successful Git branching model"

Merge and delete branch in one step/command

What are .rej files which are created during merge

Why does git merge a branch into itself?

Merge two remote branches in a Git repository

Is it possible to get a list of merges into a branch from the Github website OR API?

How to unshelve a shelved changelist to another branch prior to Perforce 2013?