2

I started using TortoiseGit for Windows but I found some things annoying. For example when I have a conflict during a merge I need to do the following:

  • do the 3 way merge (of course... there is no other choice)
  • mark the file as resolved

Is there an automatic way of marking the file as resolved if the merge ends successfully?

Thanks for any pointers,

Iulian

Yue Lin Ho
  • 2,945
  • 26
  • 36
INS
  • 10,594
  • 7
  • 58
  • 89

2 Answers2

5

You will need to adjust your config to trust the exit code of your merge tool:

git config mergetool.<tool>.trustExitCode true

This assumes that the merge tool you use has an exit code that corresponds to whether or not the merge was successful or not.

Here is more info:

http://www.kernel.org/pub/software/scm/git/docs/git-mergetool.html

Hope this helps.

Adam Dymitruk
  • 124,556
  • 26
  • 146
  • 141
  • It seems to be ok. I will try this out. Thanks! – INS Apr 21 '11 at 06:51
  • The answer should be combined with this one: http://stackoverflow.com/questions/4957630/how-do-you-merge-in-git-on-windows - with a mention: This is not available from Tortoise, but only from the command line. – INS Apr 27 '11 at 08:27
0

Well they are text files, source code. successfully is when the file works/compiles as you want it to be.

Wissam Youssef
  • 800
  • 1
  • 10
  • 20
  • I don't want to do 2 separate operations. I want that once I have merged the file with meld/kdiff3 or similar tools to be marked as resolved. – INS Apr 21 '11 at 05:34