I merged three branches and all three had one conflict The one branch I did a rebase The one I did merge before I sent a pull request The one I did a merge after I sent the pull request It's just for reference gitfun