Stephen Morton <[email protected]> writes: > I'm looking for a git branching and merge strategy for merge with lots > of conflicts requiring multiple people. I can make it work, and I > understand git, but it all seems kind of awkward and it feels like > there must be a better way. > > I've got a big git merge to do. There are lots of conflicts and it > requires many people to resolve them all.
Have you looked at git-imerge? /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: [email protected] jabber: [email protected] twitter: magthe http://therning.org/magnus As we enjoy great advantages from the inventions of others we should be glad of an opportunity to serve others by any invention of ours, and this we should do freely and generously. — Benjamin Franklin -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
signature.asc
Description: PGP signature
