Re: [golo-dev] Git workflow question

[Yannick Loiseau <me@xxxxxxxxxxxx>]

Yes that was the solution to the new head after eclipse incubation. My question was more prospective, since I restart from a fresh branch, backporting changes, 'cause I didn't do this clean separation in the first step (shame on me), and it realy diverged.

Le 25 septembre 2015 09:45:21 CEST, Julien Ponge <julien.ponge@xxxxxxxxxxxx> a écrit :

Hi Yannick,

Have you looked into rebase --onto?

It's like transplants in Mercurial.

- Julien

On Fri, Sep 25, 2015 at 9:39 AM Yannick Loiseau <me@xxxxxxxxxxxx> wrote:

I've a question for git gurus...
Suppose I have a big feature long running branch (e.g. macros), regularly rebased on master, that needs a somewhat independent refactoring (say IR creation).
In order to minimise macros branch divergence from master, I create a new branch (e.g. IrRefactoring), that will eventually be merged in master (long) before the macros one.
But to go on macros, I may need its changes before it is merged in master.
How do I integrate them in macros branch, while avoiding problems (conflicts, redontant changes,...) when finally merging macros into master?
More clearly, should I rebase macros on IrRefactoring, or pull/merge changes from IrRfactoring into macros?
Thanks guys!

_______________________________________________
golo-dev mailing list
golo-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/golo-dev

golo-dev mailing list
golo-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/golo-dev

-- 
Envoyé de mon téléphone Android avec K-9 Mail. Excusez la brièveté.