Re: git-rebase + git-mergetool results in broken state

now if I can provide any additional information. -Joe On Tue, Mar 1, 2016 at 10:38 AM, David Aguilar wrote: > On Tue, Feb 23, 2016 at 04:44:49PM -0600, Joe Einertson wrote: >> I'm experiencing an annoying issue which leaves the repository in a >> weird, broken state. I am attemp

git-rebase + git-mergetool results in broken state

ory nonexistent This leaves weird dangling files like '.merge_file_ogGjXX' in the repo, and I assume I should not proceed with the merge since it couldn't even create the files to compare. Is this a known issue? Is there any workaround? Is it safe to proceed with the merge? Thanks, J