On Tue, 4 Jun 2019 at 07:03, Sebastian Kuzminsky <[email protected]> wrote:
> > There's not really any way to merge just one commit. You merge the tip > of one branch into the tip of another branch. This is the normal > workflow, and it's good. if there is something that absolutely shouldn't transfer from 2.7 to 2.8 then you can exclude it when resolving conflicts (if it conflicts, and it's hard to imagine something that merges cleanly being something you want to exclude) -- atp "A motorcycle is a bicycle with a pandemonium attachment and is designed for the especial use of mechanical geniuses, daredevils and lunatics." — George Fitch, Atlanta Constitution Newspaper, 1916 _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
