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

Thanks for the thorough response. Here is some basic info: $ git --version git version 2.5.0 $ cat /etc/issue Ubuntu 15.10 $ git config merge.tool kdiff3 The issue seems as if it may be related to different renames of the same file/folder in both the master branch and the feature branch. I have

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

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 attempting a rather vanilla rebase, rebasing > the commits from a feature branch on top of the newest commits on > master. Can you tell u

git-rebase + git-mergetool results in broken state

I'm experiencing an annoying issue which leaves the repository in a weird, broken state. I am attempting a rather vanilla rebase, rebasing the commits from a feature branch on top of the newest commits on master. So, I run a typical series of commands: 1. git checkout feature-branch 2. git rebase