Cacher is the code snippet organizer for pro developers

how do you merge but demand the new version?
[10:24:48] Tom Procter: like...
[10:24:51] Tom Procter: git pull -X theirs
[10:24:55] Tom Procter: but as part of a merge
[10:24:57] Tom Procter: that would be useful
[10:25:32] James Sims: for merging with master I just do 

git checkout master
git pull origin master

git checkout the-new-branch
git pull origin the-new-branch

git checkout master
git merge the-new-branch
[10:25:42] James Sims: git push origin master
[10:25:59] Tom Procter: yeah
[10:26:35] James Sims: you can also do 

git checkout master
git pull origin master
git pull origin the-new-branch
[10:26:45] James Sims: 
that does the same but you have less control