git - To resolve a merge conflict, how do I see what change the other branch was making? -


i pulled latest code repository git pull --rebase. local commit conflicts 1 of remote commits. file in question has merge markers in it, can compare version version, want know change other version trying make? want diff other change our common ancestor. how do that?

(edit: gah, had broken diagram , description, let's fix it:)

this command show everything changed, , might want isolate changes specific commit or set of commits and/or files within commits, consider doing:

$ git diff $(git merge-base master origin/master) origin/master

(assuming you're on branch master). tells git compare common ancestor commit "their" head commit.

here's rough sketch of what's going on. suppose started commits a, b, , c obtained origin (the repo cloned). made commits d , e , made f , g. you're in middle of conflicted rebase. (i've assumed here change in d rebased successfully, giving commit d', , problem @ e.) +i,w means there stuff in index and/or working directory not yet committed—that's commit conflicts, need resolve.

            d - e              <-- master           / - b - c           d' +i,w    <-- head (detached)           \       /             f - g              <-- origin/master

in case, git merge-base master origin/master finds commit c, common point rebase.

meanwhile origin/master names commit g. so:

git diff <name-of-commit-c> origin/master

shows did, in both commits f , g (compares contents of g contents of c). of course, can use git log find individual commits, or name them names origin/master~1. can git show origin/master @ recent change g, , git show origin/master~1 show change f.

eventually, if once resolve conflicts , git rebase --continue , reaches end, git move branch label (master) head points, , set head refer master, rather being "detached". or, if use git rebase --abort abandon new chain , restore old master (which can re-rebase later).

(incidentally, 1 case graphical tools gitk come in handy. bring gitk --all or gitk head master origin/master on conflicted rebase , it's easy see conflicting commit is.)

for tough merge cases, there's git-imerge, have not used (yet) looks nice.


Comments

Post a Comment

Popular posts from this blog

c# - Send Image in Json : 400 Bad request -

from android trying send image class of data, iis webservice. (c#) the problem 400 bad request . the image being encoded base64 . , placed json rest of class elements. my guess base64 not valid inside json. server not understand it. if set string "" , post accepted fine. so question is, how make base64 valid within json array? ( tried url.encode no success). or how should send image android webservice? gson gson = new gson(); string json = gson.tojson(record); // record has param { string base64photo } how big image? i'm pretty sure surpassing iis json size limit (default 4 mb). check http://geekswithblogs.net/frankw/archive/2008/08/05/how-to-configure-maxjsonlength-in-asp.net-ajax-applications.aspx or http://www.webtrenches.com/post.cfm/iis7-file-upload-size-limits good luck!
Read more

javascript - addthis share facebook and google+ url -

i attempting use addthis create simple url shares whichever current page user on when click share button. of right now, have twitter working. when user clicks, able see url populated in tweet box. when user clicks facebook or google+, url doesn't seem show in share box. <ul class="addthis_toolbox addthis_default_style "> <li><a class="addthis_button_facebook"><img src="/img/facebook-social.png" width="20" height="20" border="0" alt="share" /></a></li> <li><a class="addthis_button_twitter"><img src="/img/twitter-social.png" width="20" height="20" border="0" alt="share" /></a></li> <li><a class="addthis_button_google_plusone_share"><img src="/img/google-social.png" width="20" height="20" border="0" alt="s...
Read more

ios - Show keyboard with UITextField in the input accessory view -

i have buttona , when buttona clicked, want keyboard show uitextfield in inputaccessoryview. there way have keyboard show manually , set inputaccessoryview without having uitextfield initially? thanks. you cannot summon keyboard without object can become first responder. there 2 ways work around: subclass uiview , implement uikeyinput protocol in it. example: in .h file: @interface inputobject : uiview<uikeyinput> @property (nonatomic, copy) nsstring *text; @property (nonatomic, strong) uiview *inputaccessoryview; // must override inputaccessoryview , since it's readonly default @end in .m file, implement protocol: - (bool)canbecomefirstresponder { return yes; } - (bool)hastext { return [self.text length]; } - (void)inserttext:(nsstring *)text { nsstring *selftext = self.text ? self.text : @""; self.text = [selftext stringbyappendingstring:text]; [[nsnotificationcenter defaultcenter] postnotificationname:kinputobjec...
Read more