github api - What happens to git tag after merging pull request -


what happens if have have git commit tree this:

a-b-c-d          d <-- v0.9 (tag)

and accept pull request has changes predate commit tagged; tag include commits merged pull request?

a-f-b-g-c-d      d <-- ? v0.9 (tag)

in git, tag points specific commit object. if you've done git pull --rebase graphs looks this:

a-b-c-d  a-f-b'-g-c'-d'

the actual commit objects depend on state of tree , parentage, if diff c d exact same diff between c' , d', different commit objects.

so answer question v0.9 tag point version of d when tag first created. if you've rewritten history, have tag points commit no longer in tree current branch.

if, however, mean had committed , pushed branch f b g , c before had pushed b c , d, happens depend on whether merge or rebase when required pull update local branch existing history.

default merge. make graph this:

a-f-b-g-c  \       \   b-c-d---m

where branch head point m , b , c in each branch of tree different (even if both cherry-picked same commits somewhere else).

update

tl;dr:

  • who committed first (timing) doesn't matter: order depends on graph(s) , options combine and/or alter graphs (merge, rebase, cherry-pick). decide final structure like.
  • commit objects (things tags point to) never change, tagged commit won't updated
  • since commits don't change, when history rewritten, have new commit objects if diffs identical. may things changing replaced in graph looks similar.

Comments

Post a Comment

Popular posts from this blog

SPSS keyboard combination alters encoding -

my question not have programming practical issue on spss. accident keyword combination cannot remember because did not intend press changed encoding in spss , text in data in different language english shown small boxes. nevertheless, when kind of analysis performed different language text shown in output. does know reason? tried change encoding did not produce result. first, @ edit > options , see whether setting unicode or locale. might fix it. if have text in multiple languages, want unicode. otherwise, may have specific locale set wrong. can change set locale, need know locale want use.
Read more

Socket.connect doesn't throw exception in Android -

if put nonsense url no exception thrown , none of rest of code executed not rest of asynctask called method connects. try { socketcliente.connect(new inetsocketaddress("f", port), 2000); } catch (unknownhostexception e) { geterror("host doesn't exist"); return -1; } catch (ioexception e) { geterror("could not connect: host down"); return -1; } add catch statement. catch ( exception e ) { log.d(tag, e.getmessage(),e); toast.maketext(getapplicationcontext(), "unexpected error:" + e.getmessage(), toast.length_long).show(); } this write log , pop toast tell what's going on.
Read more

iphone - How do I keep MDScrollView from truncating my row headers and making my cells look bad? -

Image
here's screenshot show describing: and relevant code: - (nsinteger)spreadview:(mdspreadview *)aspreadview numberofcolumnsinsection:(nsinteger)section{ return self.viewmodel.matrix.width - 1; } - (nsinteger)spreadview:(mdspreadview *)aspreadview numberofrowsinsection:(nsinteger)section{ return self.viewmodel.matrix.height - 1; } -(mdspreadviewcell *)spreadview:(mdspreadview *)aspreadview cellforrowatindexpath:(mdindexpath *)rowpath forcolumnatindexpath:(mdindexpath *)columnpath{ mdspreadviewcell *cell = [aspreadview dequeuereusablecellwithidentifier:@"infocell"]; if (cell == nil){ cell = [[[mdspreadviewcell alloc] initwithstyle:mdspreadviewcellstyledefault reuseidentifier:@"infocell"] autorelease]; } cell.textlabel.text = ((dtvendor *)self.vendors[rowpath.row]).name; return cell; } -(cgfloat)spreadview:(mdspreadview *)aspreadview heightforrowheaderinsection:(nsinteger)rowsection{ return 200; } -(cgfloat)spreadview:(mdspreadview...
Read more