Databases
StackOverflow2013
Postsdbo
PO"git merge -s theirs" needed -- but I know it doesn't exist
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO"git merge -s theirs" needed -- but I know it doesn't exist
    primarykey
    data
    text
    <p>I have a number of remote repositories that I want to merge together. Some of the subtrees in those repositories are unique to the remote (they contain data that is host-specific), other subtrees contain data that is (supposed to be) common across all remotes.</p> <p>What I want to do, essentially, is run "git pull " for each remote. This will fast-forward the local master branch along the tracking branch for the remote master for host-specific files that have changed on the remote, and will do nothing for the common files because they will not have changed.</p> <p>A change in a common file (call it F, with the change being F') shouldn't be a problem, even if it only happens on one remote at first. git-merge will Do The Right Thing and give me a copy of F' in my composite workspace, which is what I want. The problem comes if the same common file changes in a different way on another remote (call it F"). git-merge will give me a composite of F' and F", which isn't what I want. All I want is F".</p> <p>When I worked with ClearCase we called this a copy-merge. The result of the merge was always an exact copy of the contributor. This sounds a lot like "git merge -s theirs" would be, except that it doesn't exist.</p> <p>I wondering whether I can cook something up with "git-read-tree -m --trivial" to get the fast-forward merges out of the way, then do some magic with git-merge and a custom mergetool that simply copies the $REMOTE file to $MERGED. But even with that I don't see how I can stop git-merge from compositing F' and F" if it things the merge is trivial.</p> <p>I've read the link <a href="https://stackoverflow.com/questions/173919/git-merge-s-ours-what-about-their">Is there a &quot;theirs&quot; version of &quot;git merge -s ours&quot;?</a> on this site, and the post by Junio Hamano it references explaining why "git merge -s theirs" is such a bad idea, but this isn't the case for me. I do value the old history, but I need to jump ship and follow the change on the remote site when one happens. No new work is done on the local site. It simply needs to form a composite of all the remote sites, taking the latest "common" file from the last polled remote when one changes.</p> <p>Thanks in advance for any help you can give me.</p>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PTQuestion
    1. USCommunity
    1. USkbro
    plurals
    1. PL
      singulars
      1. LTLinked
    2. PL
      singulars
      1. LTLinked
    3. PL
      singulars
      1. LTLinked
    1. PL
      singulars
      1. LTLinked
    2. PL
      singulars
      1. LTLinked
    3. 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. PO"git merge -s theirs" needed -- but I know it doesn't exist
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. PO"git merge -s theirs" needed -- but I know it doesn't exist
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. PO"git merge -s theirs" needed -- but I know it doesn't exist
      1. This table or related slice is empty.
      1. VTUpMod
    1. COFrom the gitattributes man page: When deciding what attributes are assigned to a path, git consults $GIT_DIR/info/attributes file (which has the highest precedence), .gitattributes file in the same directory as the path in question, and its parent directories up to the toplevel of the work tree (the further the directory that contains .gitattributes is from the path in question, the lower its precedence)... so put your .gitattribute at the top of the relevant tree. the custom merge driver will only apply for that tree.
      singulars
      1. PO"git merge -s theirs" needed -- but I know it doesn't exist
      1. USVonC
    2. CO`echo * merge=keepTheir > dirWithCopyMerge\.gitattributes` should do it for all files under `dirWithCopyMerge`, not for all files for the all repo. That should be what you are looking for.
      singulars
      1. PO"git merge -s theirs" needed -- but I know it doesn't exist
      1. USVonC
    3. COI have just completed my answer to reflect my previous comments.
      singulars
      1. PO"git merge -s theirs" needed -- but I know it doesn't exist
      1. USVonC
 

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