[golo-dev] Git workflow question

[Yannick Loiseau <me@xxxxxxxxxxxx>]

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!