Hi, On 07/02/2014 01:19 PM, François Bissey wrote: > Consider that I am the village idiot, you have to explain to me how you > integrated the two branches that each had a commit that the other didn’t > have. >
quite simple ;-)
consider you have two branches in your local repo: github-master and
gentoo-master, and you have two remotes: github and gentoo. Then you do
something like:
git checkout github-master
git pull
git checkout gentoo-master
git pull
Now your local branches are in sync with remote, you can do merging
git checkout github-master
git merge gentoo-master
git push github github-master:master
git checkout gentoo-master
git merge github-master
git push gentoo gentoo-master:master
You can do it with less commands, but I've written it this way, so
everything should be completely clear. )
Regards,
Jauhien
signature.asc
Description: OpenPGP digital signature
