Johan Herland wrote: > Thanks, I'm definitely coming around to the idea that having the user freely > resolve conflicts in a temporary worktree (that preferably contains only the > conflicting notes) is better than trying to resolve conflicts _without_ a > worktree. Junio did a good job of making both interfaces --- no-resolution and resolution-in-a-worktree --- sound very appealing. Thanks for the hard work, Jonathan -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html