Sv: Sv: Sv: Ping...

[Pawel Salek <pawsa0 gmail com>]

Den 04.10.2016 21:45:39 skrev Peter Bloomfield:
> On 10/04/2016 03:17:52 PM Tue, Pawel Salek wrote:
> > Den 04.10.2016 21:15:18 skrev Peter Bloomfield:
> ...
> > > I tried to find a shortcut, but to keep the commit history it seems  
> > > we actually need to do the merge. Right now I'm trying, in master:
> > >
> > > git merge -Xtheirs gtk3
> > >
> > > and then to clean up:
> > >
> > > git diff gtk3 > ../merge-cleanup.diff
> > >
> > > followed by editing ../merge-cleanup.diff so as not to lose some  
> > > license improvements, and finally patching it (in reverse). It  
> > > gives me a master that is functionally equivalent to the gtk3  
> > > branch. Does that seem reasonable?
> >
> > It feels somewhat manual but it seems like a safe way to go. I keep  
> > my fingers crossed!
>
> Yeah, me too! I just pushed it--see if you can exhale...

This is being answered using balsa from master branch build on Ubuntu  
16.04.1. It looks pretty functional!

... thank you!

Pawel