Question

I have a repository on github that I and a friend work concurrently on. We branched our local copies of the master on github and added a lot of features to our individual branches. But we only committed to our local copies (not the one on github). How do I manage the histories and commits such that both our commits are reflected on the github repository (without a flurry of merge conflicts)? Thanks.

Plus, how do I handle the conflicts and patches? Can someone provide a visual representation of the problem and how to solve it (so that I can better understand it).

Answer 1

Instead of merging your whole brunch of commits into the remote branch at one go which makes you lot of conflicts to solve, you can also merge your commits parts by parts.

`git merge <commit point a>`

solve some conflicts first

`git merge <commit point b>`

solve some conflicts first

`git merge <commit point c>`

solve the last part of conflicts

where a,b,c are the commits point in sha-1 and a < b < c

I think this would relieve your pain a little bit.