"...complaining about the conflict resolution process..." In Fossil? Absurd. i d...

		sgbeal on Dec 4, 2014 \| parent \| context \| favorite \| on: Fossil – Simple, high-reliability, distributed sof... "...complaining about the conflict resolution process..." In Fossil? Absurd. i don't know that i have ever, without help from a git professional, successfully resolved a merge conflict in git. In fossil it's trivial.