@[email protected] good luck resolving conflicts or partially commiting without a nice gui