> On Feb 8, 2021, at 2:00 PM, David Blevins <[email protected]> wrote: > > Once we branched and changed the namespaces and dependencies we'd have > conflicts and often wouldn't be able to use git cherry pick or merge without > manual cleanup.
Here's a reference. Nishant did a conversion April last year. There are so many merge conflicts now that Github won't even try to show any insights. - https://github.com/apache/tomee/pull/633 If you hover over the greyed-out "Resolve Conflicts" button it just says the conflicts are too complex to resolve in the web editor. -David
smime.p7s
Description: S/MIME cryptographic signature
