Merge Markers

Help
Jay Mann
2010-08-19
2013-05-28
  • Jay Mann

    Jay Mann - 2010-08-19

    Hi,

    Trying to use Diffuse with git.  But for some reason it displays the merge markers where other tools process them.  Any way around this?

    Thanks.

     
  • Derrick Moser

    Derrick Moser - 2010-08-21

    The conflict markers are put there by Git.  I believe "git merge" just puts conflict markers in the local file and "git mergetool" loads the local file into one of Diffuse's panes.

     
  • Jay Mann

    Jay Mann - 2010-08-25

    It seems like other tools (p4merge, diffmerge) process the conflict markers in the merged file and highlight the local vs remote changes differently (different colors) and remove the markers.  While i don't mind seeing the conflict markers in the mergetool, it might confuse other users who are going to use this environment.  Not to mention the conflict markers need to be removed anyways, so if Diffuse procesed them, you will be saving the user one extra step.

     

Log in to post a comment.

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:

JavaScript is required for this form.





No, thanks