Hi Victor,
On 5/18/10 11:03 AM, Victor Engmark wrote:
Nope, it happens almost every time I try to rebase my code to master -
It just means that the commits in your branch could not be applied
trivially to master. You could try `git mergetool` to see how your
branch conflicts with master. If that complains that you haven't
configured a merge tool, you can do that using `git config --global
merge.tool meld` (for meld).
The thing is that no files need merging.
bash-3.2$ git mergetool
No files need merging
I manually diffed the 3 files that cause problem against the files in
the master branch and they are identical. This leads me to think that
something is wrong with the git indexes.
Benoit.
