Thanks Stefan. --accept=postpone sounds like just what I need.
I ended up discovering that if I committed an empty directory in the location
of the conflict, it would skip the deep history search, and show a different
tree conflict right away. So that got me out of waiting. But I'll try
--accep
On Tue, Aug 04, 2020 at 06:37:07PM +, Jacob Weber wrote:
> Hi there. I'm doing a merge which seems to be doing a very long-running
> operation (over an hour so far) when it gets to the "Searching tree conflict
> details" step. I'm wondering if there's any way to avoid this.
>
> I'm merging f
Hi there. I'm doing a merge which seems to be doing a very long-running
operation (over an hour so far) when it gets to the "Searching tree conflict
details" step. I'm wondering if there's any way to avoid this.
I'm merging from a branch X where a directory was removed, into a branch Y
where th
