Databases
StackOverflow2013
Postsdbo
POMsys Git Merge Tool Command Options Issue
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POMsys Git Merge Tool Command Options Issue
    primarykey
    data
    text
    <p>I'm using <a href="http://code.google.com/p/msysgit/" rel="noreferrer">msys Git</a> for source control on a Windows machine and I'm trying to figure out how to get my merge tool, <a href="http://winmerge.org/" rel="noreferrer">WinMerge</a>, to work with Git.</p> <p>I've followed <a href="http://davesquared.blogspot.com/2009/02/setting-up-diff-and-merge-tools-for-git.html" rel="noreferrer">the instructions on this blog</a> to the best of my ability since it's the closest I've found to what I'm trying to do. Basically what I did was:</p> <p>Modify my <code>.gitconfig</code> file to include the following:</p> <pre> [merge] tool = winmerge [mergetool "winmerge"] cmd = \"C:\\Program Files (x86)\\WinMerge\\WinMergeU.exe\" "$PWD/$LOCAL" "$PWD/$REMOTE" "$PWD/$MERGED" trustExitCode = false keepBackup = false </pre> <p>This is almost working. When I try to run the merge tool from Git, WinMerge gives me an error saying it can't find the paths of the files, which makes complete sense since the paths it is looking for are:</p> <pre> C:\MY\WORKING\DIRECTORY\-e C:\MY\WORKING\DIRECTORY\-ub </pre> <p>It looks like Git is passing options into the merge tool instead of the local &amp; remote file names that I would expect to get passed if everything was working correctly.</p> <p>I've searched online for Git's merge documentation, but I can't seem to find anything related to what I'm trying to do. My guess is that the solution will be one of the following:</p> <ol> <li>Change the <code>$LOCAL</code> &amp; <code>$REMOTE</code> variables to the correct values, assuming <code>$LOCAL</code> &amp; <code>$REMOTE</code> are incorrect. </li> <li>Write a <code>.bat</code> script to call WinMergeU, and handle the arguments Git sends to the merge tool within the logic of my <code>.bat</code> script.</li> </ol>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. USDan Herbert
    1. USDan Herbert
    plurals
    1. PL
      singulars
      1. LTLinked
    1. PL
      singulars
      1. LTLinked
    2. PL
      singulars
      1. LTLinked
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    2. PO
      singulars
      1. PTAnswer
    3. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POMsys Git Merge Tool Command Options Issue
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POMsys Git Merge Tool Command Options Issue
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POMsys Git Merge Tool Command Options Issue
      1. USFrank Farmer
      1. VTFavorite
    1. This table or related slice is empty.
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload