How select a file from one branch when resolving conflict during git rebase? -


given git repo 2 branches master , feature. when rebasing feature branch on top of master using rebase master lets file a.txt contains conflict needs resolved before rebase can continue.

i know can resolve conflict in 3 steps:

  1. open a.txt in editor manually resolve conflict
  2. call git add a.txt tell git have manually resolved conflict
  3. call git rebase --continue move rebase forward

is there way avoid step 1 telling git want version of file master branch or want version of file feature branch without having steps 1 , 2 above.

yes. in fact, there's more 1 way it.

the rebase , merge (and cherry-pick, matter) commands take same strategy , -x flags pass underlying git merge machinery. recursive strategy, -xours , -xtheirs choose 1 or other "sides" of files in case of file modified in both branches being merged.

or—this quite different—in cases when merge stops conflict, can use git checkout --ours or --theirs flags, pick version 1 side or other. (you can other commands; here, i'll stick --ours , --theirs these match arguments commands use merge machinery.)

this of course different because can switch choices:

$ git checkout main switched branch 'main' $ git merge branch ... conflicts in files , b ... $ git checkout --ours --    # takes main:a $ git checkout --theirs -- b  # takes branch:b

note quite different "ours strategy" (the above shows "recursive strategy ours option"). "ours strategy", different occurs. let's start without it, doing same merge again:

$ git checkout main && git merge branch ... conflicts ... $ git checkout --ours -- b  # take main:a , main:b

let's there's third file, c, git can merge on own. when above, git merges c , take main:a , main:b. if use git merge --strategy=ours branch, though, git take main:a, main:b, , main:c. discard branch:c changes rather automatically merging them.

i've used git merge above because makes "ours" , "theirs" stuff "work right". dislike way git names these, though, because when you're doing rebase, ours/theirs version swapped around, because rebase works changing "other" branch , doing series of cherry-picks. is:

$ git checkout mine; git rebase theirs

works underneath doing (very) rough equivalent of:

$ git checkout theirs; git cherry-pick theirs..mine

and afterward, shuffling branch labels around branch theirs not move. (it's not bad internally :-) manage make --ours mean "theirs" , --theirs mean "ours", pretty bad externally.)


-

Comments

Post a Comment

Popular posts from this blog

html - Sizing a high-res image (~8MB) to display entirely in a small div (circular, diameter 100px) -

first of all, thank being patient know simple question more couple of weeks' experience figure out. i've seen folks persevere , helpful on here , hope you're willing me. here fiddle: http://jsfiddle.net/65uzf/ here 1 of places searched answers on here: ( vertically center image thumbnails fix-sized div ) tried solutions on there , didn't work out me. i've searched ~4 or 5 others, , been unsuccessful those, too. what want take large image (what linked background-image #ysypic , #tabpic divs) , display thumbnail version of image in confines of divs have set it. is, using background properties have laid out in css, portion of image displays inside of circular divs. without these properties, display defaults smaller section of image [presumably pi*(50^2) area in top left] terrible resolution. i not care if entire image doesn't display inside of circles (it won't, given difference in shape), , overflow not being displayed fine. want able see figu
Read more

java - IntelliJ - No such instance method -

using intellij's 12 ultimate, i'm running following code in debugger: java import play.api.libs.json.jsvalue; public class foo { ... public jsvalue tojson() { ... } public class fooexample { ... foo foo = new foo(); system.out.println("...); //<-- breakpoint at breakpoint, right-clicked source code , picked "evaluate expression," typing in: foo.tojson() . but following error showed up: no such instance method: play.api.libs.json.jsvalue$class.com.foo.foo.tojson () am doing wrong? foo#tojson calls scala code, if matters. edit had breakpoint after instantiation of foo. downvoted it, deserved it. edit my answer no longer valid after op modified question (i.e. moved breakpoint actual is).. a breakpoint hit before line executed. in case foo has not yet been declared or instantiated (i.e. foo constructor has not yet been called). you'll need put breakpoint @ next line (or step on current line) if want evaluate foo .
Read more

identifier - Is it possible for an html5 document to have two ids? -

i wondering if html5 element can have 2 ids, this: <button id="thing1" id="thing2" name="button1" onclick="change()">click here</button> or this: <button id="thing1, thing2" name="button1" onclick="change()">click here</button> also, if 1 of ids said 1 thing, , other id said thing, 1 used? tl;dr : no. in versions of html, each element can have 1 id. see the spec : the id attribute specifies element's unique identifier (id). [dom] the value must unique amongst ids in element's home subtree , must contain @ least 1 character. the value must not contain space characters. note: there no other restrictions on form id can take; in particular, ids can consist of digits, start digit, start underscore, consist of punctuation , etc. note: element's unique identifier can used variety of purposes, notably way link specific parts of document usin
Read more