Re: [gentoo-science] overlay and github out of sync again

[François Bissey]

On Thu, 03 Jul 2014 09:25:47 François Bissey wrote:
> On Wed, 02 Jul 2014 15:12:27 Justin wrote:
> > On 02/07/14 13:32, Jauhien Piatlicki wrote:
> > > 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
> >
> > Hey guys,
> >
> > as I wrote some month ago, I placed a script into the script dir called
> > "merge-dualHEAD" which we can use for syncing.
>
> Can we put a note on the github wiki about it then? Because I remembered
> there was something on the mailing list but yes it was months ago. Possibly
> a couple of years even.
>
Ok only 5 months :)