Unclear how to actually resolve the conflict
ddevault opened this issue · comments
The controls are all about navigating... nothing about actually fixing the conflict.
A and d “selects” one of the two conflicts. I should have chosen a better word for them.
Sent with GitHawk
What do you think of using 1 or 2 to select the conflicts? @SirCmpwn
Hmm. Conflicts that are solved with an ours or theirs approach is generally pretty rare (I'd also note that "ours" and "theirs" is the terminology you should use here). Most of the time I have to manually tweak the final result. Most conflict resolution tools have three screens - ours, theirs, and final, and lets you edit the third.
I agree. So I was thinking of adding an e for [e]dit option. But instead of displaying a third panel for it, I would launch the user's default editor.
I can resolve conflicts in vim without your tool.
Well I guess the problem has been solved then!
That's not what I mean. I mean if you're just going to launch the user's editor to resolve conflicts with why wouldn't they just skip the middleman?
Fac could open up vim without all the nasty markers. The user could choose one of the two choices before fac opens up the editor.
Sent with GitHawk