Rework git-checkbuild to account for failed merges and

forced updates. Refs #6653
git-finish now requires branch to be merged to develop. Refs #6653