Styjun

Fedora boot screen shows both Fedora logo and Lenovo logo. Why and How?

What was the Shuttle Carrier Aircraft escape tunnel?

Output of "$OSTYPE:6" on old releases of Mac OS X

If I wouldn't want to read the story, is writing it still a good idea?

Is my Rep in Stack-Exchange Form?

How do I professionally let my manager know I'll quit over smoking in the office?

I am completely new to Tales from the Floating Vagabond, how do I get started?

Why did pressing the joystick button spit out keypresses?

A STL-like vector implementation in C++

What is this tool/thing in an Aztec painting?

What are the penalties for overstaying in USA?

As a fresh graduate, should I get my first credit card?

Has there been any indication at all that further negotiation between the UK and EU is possible?

Should I prioritize my 401(k) over my student loans?

Find the probability that the 8th woman to appear is in 17th position.

Java TreeMap.floorKey() equivalent for std::map

(Newbie question)Why is voltage measurement of circuit different when switch is on?

Find the C-factor of a vote

Employer wants to use my work email account after I quit

Are all instances of trolls turning to stone ultimately references back to Tolkien?

First-year PhD giving a talk among well-established researchers in the field

Why do some games show lights shine thorugh walls?

Links to webpages in books

How does a monk's Martial Arts feature modify damage done by magical monk weapons?

git subtree pull together with strategy-option=theirs

What is the difference between 'git pull' and 'git fetch'?When would you use the different git merge strategies?Git workflow and rebase vs merge questionsSimple tool to 'accept theirs' or 'accept mine' on a whole file using gitEasy way to pull latest of all git submodulesHow do I force “git pull” to overwrite local files?Using Git and Dropbox together effectively?Squash my last X commits together using Gitgit cherry-pick says “…38c74d is a merge but no -m option was given”Choose Git merge strategy for specific files (“ours”, “mine”, “theirs”)

.everyoneloves__top-leaderboard:empty,.everyoneloves__mid-leaderboard:empty,.everyoneloves__bot-mid-leaderboard:empty margin-bottom:0;

0

I have a project A which uses project B as as a subtree. I want to pull stuffs from project B, which has been updated. I can run command like the following:

git subtree pull --prefix <prefix> --squash <git-repo> master

When I do this a merge conflict exists, within the scope of the subtree prefix directory. I do however want to accept everything that project B has updated unconditionally. (Why are those committed in the first place? It's hard to explain but it is the nature of our project and our developers, however unreasonable.)

So in another word what I really want is to make sure the prefix directory is updated to the latest in B.

In a normal merge between different branches, I have something at my disposal:

git merge --strategy-option=theirs branchB

which merges normally but accepts branchB's version wherever there is a conflict.

Is there similar thing I can do? Or is the best thing to do is to just remove the subtree project and add it back again?

git git-subtree

share|improve this question

asked Mar 25 at 9:29

huggiehuggie

6,9681818 gold badges7070 silver badges111111 bronze badges

add a comment | 

0

I have a project A which uses project B as as a subtree. I want to pull stuffs from project B, which has been updated. I can run command like the following:

git subtree pull --prefix <prefix> --squash <git-repo> master

When I do this a merge conflict exists, within the scope of the subtree prefix directory. I do however want to accept everything that project B has updated unconditionally. (Why are those committed in the first place? It's hard to explain but it is the nature of our project and our developers, however unreasonable.)

So in another word what I really want is to make sure the prefix directory is updated to the latest in B.

In a normal merge between different branches, I have something at my disposal:

git merge --strategy-option=theirs branchB

which merges normally but accepts branchB's version wherever there is a conflict.

Is there similar thing I can do? Or is the best thing to do is to just remove the subtree project and add it back again?

git git-subtree

share|improve this question

asked Mar 25 at 9:29

huggiehuggie

6,9681818 gold badges7070 silver badges111111 bronze badges

add a comment | 

I have a project A which uses project B as as a subtree. I want to pull stuffs from project B, which has been updated. I can run command like the following:

git subtree pull --prefix <prefix> --squash <git-repo> master

When I do this a merge conflict exists, within the scope of the subtree prefix directory. I do however want to accept everything that project B has updated unconditionally. (Why are those committed in the first place? It's hard to explain but it is the nature of our project and our developers, however unreasonable.)

So in another word what I really want is to make sure the prefix directory is updated to the latest in B.

In a normal merge between different branches, I have something at my disposal:

git merge --strategy-option=theirs branchB

which merges normally but accepts branchB's version wherever there is a conflict.

Is there similar thing I can do? Or is the best thing to do is to just remove the subtree project and add it back again?

git git-subtree

share|improve this question

asked Mar 25 at 9:29

huggiehuggie

6,9681818 gold badges7070 silver badges111111 bronze badges

share|improve this question

asked Mar 25 at 9:29

huggiehuggie

6,9681818 gold badges7070 silver badges111111 bronze badges

share|improve this question

asked Mar 25 at 9:29

huggiehuggie

6,9681818 gold badges7070 silver badges111111 bronze badges

asked Mar 25 at 9:29

huggiehuggie

6,9681818 gold badges7070 silver badges111111 bronze badges

asked Mar 25 at 9:29

huggiehuggie

6,9681818 gold badges7070 silver badges111111 bronze badges