On Mon, 2021-01-11 at 12:42 -0600, Benjamin Marzinski wrote: > On Mon, Jan 11, 2021 at 03:54:01PM +0100, Martin Wilck wrote: > > > > We should discuss the git workflow. Until now, I've always rebased > > my > > branches on Christophe's when pulling. I would like to switch to a > > merge-based workflow for "queue" and "fixes". This would make it > > easier > > for third parties to pull from these branches. It would mean that > > Christophe's repo won't keep a fully linear history. I'm not sure > > if > > that matters to anyone, but I wanted to ask anyway. The "tip" > > branch > > will continue to be rebased (onto "queue"). > > > Souds reasonable. I made a first merge between "queue" and "fixes" now Christophe, now would be the time to raise your voice if you dislike this. https://github.com/openSUSE/multipath-tools/commits/queue https://github.com/openSUSE/multipath-tools/commits/tip Regards, Martin -- dm-devel mailing list dm-devel@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/dm-devel
