From: Sergio B. <ser...@gm...> - 2016-09-14 22:20:45
|
On 03/08/16 23:45, Sergio Baldovi wrote: > I've tried to reparent the merge commits [1]. This can be done with "git > replace", "git filter-branch --parent-filter" or "grafts + git > filter-branch". A new branch merge shows only one conflict. Seems the > easier method (i.e., less manual interaction) at the moment: > > https://github.com/sbaldovi/fuse-v3 > https://github.com/sbaldovi/libspectrum-v3 IMO this milestone from August fix the merge conflicts of active branches and allow to do the migration with a minimum set of data. I've just added the rest of feature branches to the repository in a manual revision: https://github.com/sbaldovi/fuse-v4 https://github.com/sbaldovi/libspectrum-v4 https://github.com/sbaldovi/fuse-utils-v4 I think I can't go much further than this. Thinking on release branches, currently a new branch is created for every major release (e.g., Release-1_2_0-branch). Assuming that Fuse doesn't maintain several branches at the same time, it would be possible to create an unique "stable" branch with tagged release versions, like a rolling release. That would allow other projects (like Spectacol) to build (rebase?) customizations over the stable branch, hopefully with less effort. Cheers, Sergio |