On 3/30/21 9:43 AM, Philip Leishman wrote:
3. If there are changes on master I can merge these into my working branch.
This is the part that surprises me mainly because I usually set devs at work up with a patch-based workflow to start. Hoping to get them to the point where they can contribute to open source if they ever feel the desire. git format-patch can't handle merges, though, and that makes a mess of things.
However I was pleasantly surprised when I did my first merge of one of your branches with merges in it and all was well. Very nice.
I should probably abandon the patch-based workflow at work and force everyone to do the fork/merge request workflow. I think that's more relevant these days anyway.
Ted. _______________________________________________ Rosegarden-devel mailing list Rosegarden-devel@lists.sourceforge.net - use the link below to unsubscribe https://lists.sourceforge.net/lists/listinfo/rosegarden-devel
