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...
Peter
_______________________________________________
balsa-list mailing list
[email protected]
https://mail.gnome.org/mailman/listinfo/balsa-list
