Recently I have been trying to diversify my usage of source code control so as to be more familiar with the different tools that are currently popular so I have been using git more for personal projects and recently I came across a process hurdle that didn’t seem to have a simple solution:

• We have a project in git hosted as a private repo at GitHub
• We have multiple contributors
• Development is happening in a development branch
• development contains many commits that we don’t want in master because of the differences between production and development environments
• development also contains code we don’t want to release yet
• We want to maintain attribution for code changes in what is merged to master

All in all, it felt like this should be simple, right, surely I can just git checkout master && git merge development {path_to_folder_containing_code} right … well not really.

Continue reading “Easy partial branch merging in git” →