0

I have two git branches. They've both been undergoing development separately. When I do a do a git mergetool to use Tortoisemerge to resolve some merge conflicts, I get this error:

Tortoisemerge cannot be used without a base.

Perhaps I'm missing something in the git docs. Nothing I've seen seems quite like what I want to do:

Perform a git merge. In the case of a normal file conflict with no BASE that git can figure out by default, just use the local version of the file as the BASE.

Is there some way to do this?

Jake Henningsgaard
  • 704
  • 1
  • 6
  • 16
Bill
  • 83
  • 1
  • 7

2 Answers2

1

The problem could be the way you're calling tortoise merge.

Take a look at: this answer and this one

They both solve the same issue ;-)

Just in case:

create a CMD file which will launch TortoiseMerge:

TortoiseMerge.exe -base:%1 -mine:%2 -theirs:%3 -merged:%4

And set up your mergetool in .gitconfig:

[merge]
    tool = mytool
[mergetool "mytool"]
    cmd = cmd /C tortoiseMerge-git.cmd "$BASE" "$LOCAL" "$REMOTE" "$MERGED"

Cheers,

LEslie

Community
  • 1
  • 1
UrsoBranco
  • 116
  • 4
  • The cmd wasn't executing on my env in git bash. You can fiddle with it if you really really want to use tortoisemerge in your env. This probably works in the general case, so I'm upvoting it anyway. – Bill Dec 08 '16 at 20:10
0

The question is wrong.

The thing that worked for me was to use a different merge tool.

People from the future: don't use tortoisemerge. Use meld if you want a gui, or vimdiff if you hate your mouse.

Bill
  • 83
  • 1
  • 7