HiggsAnalysis-CombinedLimit
Recipe for a successful merge with conflicts
git clone https://github.com/cms-analysis/HiggsAnalysis-CombinedLimit.git comb
cd comb/
git checkout master
git merge [branch_to_merge]
git checkout -b [branch_to_merge]
git pull git@github.com:[user_to_merge]/HiggsAnalysis-CombinedLimit.git [branch_to_merge]
[resolve conflicts]
git add [files where conflicts were resolved]
git commit #(should contain a header telling something about merging [branch_to_merge])
git push origin master