title: Git Merge Issues from multiple branches
body: <p>I have a project with multiple subfolders and multiple engineers working on it. It only has a single git repo for the top folder.</p>
  
  <p>All the developers checkout a common master on Monday and create their individual branches from it. They edit code, mostly on separate files and folders, but there are some files that are common and edited by all parties.</p>
  
  <p>My problem comes in that I may merge one developers branch into master and commit and push that. If that developer only worked on files 1 and 2, those are the only one to be updated in the commit. That's great.</p>
  
  <p>A second developer works on files 3 and 4 and when that is merged after the merge of developer 1, I sometimes see strange behavior, it is almost as if the previous merged changes are "un-merged".</p>
  
  <p>On common files, I sometimes get conflicts and use meld to merge them manually.</p>
  
  <p>I cannot quite put my finger on the exact problem yet, but was hoping that the community might point be in the right direction.</p>
  
  <p>Am I going about the merge in the wrong way?</p>
  
  <p>Is there a way to merge every file that shows changes manually with merge tool like meld? I know it will take longer, but I cannot keep wasting the time of my developers with incorrect merges.</p>