This is normally ignored by git
Merge remote branch 'origin/master'
Merge branch 'master' into linny