Databases
StackOverflow2013
Postsdbo
POGit merge driver problem
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POGit merge driver problem
    primarykey
    data
    text
    <p>I'm trying to get git to allow me very manual merges due the way my code is (long story, it is <a href="https://stackoverflow.com/questions/3091581/need-git-workflow-suggestion">explained here</a>). I almost got it the way I wanted, just something missing in a specific situation. Shouldn't be too hard: I've got the custom driver to use WinMerge with something like<code>c:/wm/winmerge.exe $1 $2 $3</code> (into c:/wm/wmrg.sh), <code>git config merge.mnl.driver = "c:/wm/wmrg.sh %B %A %A"</code> and the <code>echo *.xml merge=mnl &gt; $GIT_DIR/info/attirbutes</code>.</p> <p>Now when I <code>git merge dev</code>, it opens WinMerge an let me do the work - brilliant. It just didnt work in the following situation:</p> <p>Having my two branches (<strong>master</strong> and <strong>dev</strong>) committed with some changes waiting in <strong>dev</strong> to be merged into production.</p> <ol> <li>Go back to <code>master</code></li> <li>Rename some files unrelated to the changes (lets say, some readme.txt to manual.txt) in <code>dev</code> and commit it</li> <li>Go to <code>dev</code> and merge these changes from <code>master</code> <strong>[</strong> the new driver kicks in and asks you if should it pass those configs to the other files in <code>dev</code>. You quit WinMerge without saving thus not migrating the info. After you finish looking the XML's the txt aren't filtered and get renamed in dev <strong>]</strong></li> <li>now back to the <code>master</code>, merge <code>dev</code></li> </ol> <p>Here I'd expect the driver to kick in again and behave the same about the XML's. For some reason though, when you try to <code>git merge dev</code> it decides to Auto-Merge it all!</p> <p>Is there any sort of 'per branch' configuration getting me here? maybe after git realizes I did not do any changes after a last merge it can just overwrite files in certain direction.. or even, the sort of merge used is based in some 'newer older' rule which find the situation as 'trivial' and decides which file should be kept regardless it's contents...</p> <p>please advise..</p> <p>thanks</p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. USCommunity
    1. USfilippo
    plurals
    1. PL
      singulars
      1. LTLinked
    2. PL
      singulars
      1. LTLinked
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    2. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POGit merge driver problem
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POGit merge driver problem
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POGit merge driver problem
      1. USHiroyuki Wada
      1. VTFavorite
    1. COI haven't managed to avoid GIT smartness yet, but I managed to use `cherry-pick` to apply the name changes into my **dev** branch without suffering the auto-merges.
      singulars
      1. POGit merge driver problem
      1. USfilippo
 

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