RE: Git branches and pull requests [1 Attachment]
"Andrew Cherry acherry-NWPX/Z+L6M5+PewX70cd0QC/[email protected] [win_tech_off_topic]" <[email protected]> Wed, 24 Aug 2016 10:05:41 +0200
| Newsgroups | gmane.comp.windows.off-topic |
|---|---|
| Message-ID | <[email protected]> |
--_A8D731A7-739C-42D2-ADAD-54FF17E27CDB_ Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In my experience, a pull request merges the state of the source branch AT T= HE TIME OF MERGE. Helpful for addressing PR issues or last minute rebasing, surprising when y= ou didn=E2=80=99t expect the merge to happen just yet. This is in Github, however; I don=E2=80=99t know if VSTS Git behaves differ= ently =E2=80=93 but the need to push new commits for PR responses suggests = to me it would not. Andrew Sent from my Windows 10 phone [10586 - 16.0.7300.4019] From: John Elliot V [email protected] [win_tech_off_topic] Sent: Wednesday, August 24, 2016 9:51 AM To: [email protected] Subject: [OT] Git branches and pull requests =C2=A0=20 Does anyone know what happens in this scenario: 1. Create a local branch Dev_1.0_JE_Sprint3 2. Commit a bunch of files to Dev_1.0_JE_Sprint3 3. Checkout Dev_1.0 4. Merge Dev_1.0_JE_Sprint3 from Dev_1.0 5. Publish Dev_1.0_JE_Sprint3 to origin server 6. Create a pull request for Dev_1.0_JE_Sprint3 to Dev_1.0 7. Commit a bunch of extra files to local Dev_1.0_JE_Sprint3 8. Publish Dev_1.0_JE_Sprint3 to origin server Assuming steps 1 to 8 happen before the pull request is actioned will the extra files from step 7 be in the pull request or not? Regards, John Elliot V --=20 E: [email protected] P: +61 4 3505 7839 W: https://www.jj5.net/ --_A8D731A7-739C-42D2-ADAD-54FF17E27CDB_ Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/htm= l4/strict.dtd"> <html> <head> </head> =20 <body style=3D"background-color: #fff;"> <span style=3D"display:none"> </span> <!--~-|**|PrettyHtmlStartT|**|-~--> <div id=3D"ygrp-mlmsg" style=3D"position:relative;"> <div id=3D"ygrp-msg" style=3D"z-index: 1;"> <!--~-|**|PrettyHtmlEndT|**|-~--> <div id=3D"ygrp-text" > =20=20=20=20=20=20 <!--~-|**|PrettyHtmlStart|**|-~--> <span style=3D"font-weight: 700; font-size: 12px; display: block; m= argin-bottom: 20px;">[<a style=3D"text-decoration: none;" href=3D"#TopText"= >Attachment(s)</a> from Andrew Cherry included below]</span> <!--~-|**|PrettyHtmlEnd|**|-~--> =20=20=20=20=20=20 <p><div class=3D"WordSection1"><p class=3D"MsoNormal">In my experienc= e, a pull request merges the state of the source branch AT THE TIME OF MERG= E.</p><p class=3D"MsoNormal"><o> </o></p><p class=3D"MsoNormal">Helpfu= l for addressing PR issues or last minute rebasing, surprising when you did= n=E2=80=99t expect the merge to happen just yet.</p><p class=3D"MsoNormal">= <o> </o></p><p class=3D"MsoNormal">This is in Github, however; I don= =E2=80=99t know if VSTS Git behaves differently =E2=80=93 but the need to p= ush new commits for PR responses suggests to me it would not.</p><p class= =3D"MsoNormal"><o> </o></p><p class=3D"MsoNormal">Andrew<o></o></p><p = class=3D"MsoNormal"><o> </o></p><p class=3D"MsoNormal">Sent from my Wi= ndows 10 phone<span style=3D"font-size:12.0pt;"><o></o></span></p><p class= =3D"MsoNormal">[10586 - 16.0.7300.4019]</p><p class=3D"MsoNormal"><span sty= le=3D"font-size:12.0pt;font-family:"Times New Roman",serif;"><o>&= nbsp;</o></span></p><div style=3D"border-top:solid #E1E1E1 1.0pt;padding:3.= 0pt 0in 0in 0in;"><p class=3D"MsoNormal" style=3D"padding:0in;"><b>From: </= b><a href=3D"mailto:[email protected]">John Elliot V jj5@j= j5.net [win_tech_off_topic]</a><br><b>Sent: </b>Wednesday, August 24, 2016 = 9:51 AM<br><b>To: </b><a href=3D"mailto:[email protected]"= >[email protected]</a><br><b>Subject: </b>[OT] Git branche= s and pull requests</p></div><p class=3D"MsoNormal"><span style=3D"font-siz= e:12.0pt;font-family:"Times New Roman",serif;"><o> </o></spa= n></p><p class=3D"MsoNormal"><span style=3D"font-size:12.0pt;font-family:&q= uot;Times New Roman",serif;"> </span><span style=3D"font-size:12.= 0pt;font-family:"Times New Roman",serif;"> </span><span style=3D"= font-size:12.0pt;font-family:"Times New Roman",serif;"><o></o></s= pan></p><div id=3D"ygrp-mlmsg"><div id=3D"ygrp-msg"><div id=3D"ygrp-text"><= p>Does anyone know what happens in this scenario:<br><br>1. Create a local = branch Dev_1.0_JE_Sprint3<br>2. Commit a bunch of files to Dev_1.0_JE_Sprin= t3<br>3. Checkout Dev_1.0<br>4. Merge Dev_1.0_JE_Sprint3 from Dev_1.0<br>5.= Publish Dev_1.0_JE_Sprint3 to origin server<br>6. Create a pull request fo= r Dev_1.0_JE_Sprint3 to Dev_1.0<br>7. Commit a bunch of extra files to loca= l Dev_1.0_JE_Sprint3<br>8. Publish Dev_1.0_JE_Sprint3 to origin server<br><= br>Assuming steps 1 to 8 happen before the pull request is actioned will<br= >the extra files from step 7 be in the pull request or not?<br><br>Regards,= <br>John Elliot V<br>-- <br>E: [email protected]<br>P: +61 4 3505 7839<br>W: = https://www.jj5.net/<o></o></p></div><div><p class=3D"MsoNormal"><span styl= e=3D"font-size:12.0pt;font-family:"Times New Roman",serif;color:w= hite;"><o></o></span></p><p class=3D"MsoNormal"><o> </o></p></div></di= v></div></div></p> </div> =20=20=20=20=20 <!--~-|**|PrettyHtmlStart|**|-~--> <div style=3D"color: #fff; height: 0;">__._,_.___</div> <p style=3D"clear: both; margin: 0 0; padding: 0 0 3px 0;"><spa= n style=3D"color: #628C2A; font-weight: 700; font-size: 13px;">Attachment(s= ) from Andrew Cherry</span> | <span style=3D"font-size: 13px;"><a style=3D"= text-decoration:none;" href=3D"https://groups.yahoo.com/neo/groups/win_tech= _off_topic/attachments/439459729;_ylc=3DX3oDMTJxamlncjhlBF9TAzk3MzU5NzE0BGd= ycElkAzM3MDE1MjQEZ3Jwc3BJZAMxNzA1MDA2NjY5BHNlYwNhdHRhY2htZW50BHNsawN2aWV3T2= 5XZWIEc3RpbWUDMTQ3MjAyNTk0Ng--">View attachments on the web </a></span></p> =20=20=20=20 <p id=3D"attach-count" style=3D"margin: 0 0 2px 0; padding: 10px 0 = 0 0;"><span style=3D"color: #628C2A; font-weight: 700;"> 1 of 1 Photo(s)</s= pan> </p> <div class=3D"attach-table" style=3D"width: 400px; margin-bottom: 5= px; display: table;"> <div style=3D"width: 70px; overflow: hidden; float: left; m= argin: 2px 0;"> <div class=3D"ygrp-photo" title=3D"0E5AF1046A1148F28B49B8BE8B5270E7.p= ng" style=3D"border: 1px solid #666; height: 62px; width: 62px; overflow: h= idden; background-color: #fff;"><a href=3D"https://groups.yahoo.com/neo/gro= ups/win_tech_off_topic/attachments/439459729;_ylc=3DX3oDMTJtbzV1dGhtBF9TAzk= 3MzU5NzE0BGdycElkAzM3MDE1MjQEZ3Jwc3BJZAMxNzA1MDA2NjY5BHNlYwNhdHRhY2htZW50BH= NsawNwaG90bwRzdGltZQMxNDcyMDI1OTQ2?itemid=3D1108360063"><img src=3D"https:/= /xa.yimg.com/kq/groups/3701524/tn/1108360063" style=3D"border: none;" alt= =3D"0E5AF1046A1148F28B49B8BE8B5270E7.png"/></a></div> <div class=3D"ygrp-photo-title" style=3D"clear: both; font-size: smalle= r; height: 14px; overflow: hidden; text-align: center; width: 64px;"> <a st= yle=3D"text-decoration: none;" href=3D"https://groups.yahoo.com/neo/groups/= win_tech_off_topic/attachments/439459729;_ylc=3DX3oDMTJtbzV1dGhtBF9TAzk3MzU= 5NzE0BGdycElkAzM3MDE1MjQEZ3Jwc3BJZAMxNzA1MDA2NjY5BHNlYwNhdHRhY2htZW50BHNsaw= NwaG90bwRzdGltZQMxNDcyMDI1OTQ2?itemid=3D1108360063" title=3D"0E5AF1046A1148= F28B49B8BE8B5270E7.png">0E5AF1046A1148F28B49B8BE8B5270E7.png</a></div> </div> </div> =20=20 =20 =20=20=20=20 <div style=3D"clear:both"> </div> <div id=3D"fromDMARC" style=3D"margin-top: 10px;"> <hr style=3D"height:2px ; border-width:0; color:#E3E3E3; background= -color:#E3E3E3;"> Posted by: Andrew Cherry <acherry-NWPX/Z+L6M5+PewX70cd0QC/[email protected]> <= hr style=3D"height:2px ; border-width:0; color:#E3E3E3; background-color:#E= 3E3E3;"> </div> <div style=3D"clear:both"> </div> <table cellspacing=3D4px style=3D"margin-top: 10px; margin-bottom: 10px= ; color: #2D50FD;"> <tbody> <tr> <td style=3D"font-size: 12px; font-family: arial; font-weight: bo= ld; padding: 7px 5px 5px;" > <a style=3D"text-decoration: none; color: #2D50FD= " href=3D"https://groups.yahoo.com/neo/groups/win_tech_off_topic/conversati= ons/messages/60565;_ylc=3DX3oDMTJxMzJrbm9jBF9TAzk3MzU5NzE0BGdycElkAzM3MDE1M= jQEZ3Jwc3BJZAMxNzA1MDA2NjY5BG1zZ0lkAzYwNTY1BHNlYwNmdHIEc2xrA3JwbHkEc3RpbWUD= MTQ3MjAyNTk0Ng--?act=3Dreply&messageNum=3D60565">Reply via web post</a> </td> <td>•</td> <td style=3D"font-size: 12px; font-family: arial; padding: 7px 5p= x 5px;" > <a href=3D"mailto:acherry-NWPX/Z+L6M5+PewX70cd0QC/[email protected]?subject=3DRE%3A%20%= 5BOT%5D%20Git%20branches%20and%20pull%20requests" style=3D"text-decoration:= none; color: #2D50FD;"> Reply to sender </a> </td> <td>•</td> <td style=3D"font-size: 12px; font-family: arial; padding: 7px 5p= x 5px;"> <a href=3D"mailto:[email protected]?subject=3D= RE%3A%20%5BOT%5D%20Git%20branches%20and%20pull%20requests" style=3D"text-de= coration: none; color: #2D50FD"> Reply to group </a> </td> <td>•</td> <td style=3D"font-size: 12px; font-family: arial; padding: 7px 5p= x 5px;" > <a href=3D"https://groups.yahoo.com/neo/groups/win_tech_off_top= ic/conversations/newtopic;_ylc=3DX3oDMTJlaGRiazIwBF9TAzk3MzU5NzE0BGdycElkAz= M3MDE1MjQEZ3Jwc3BJZAMxNzA1MDA2NjY5BHNlYwNmdHIEc2xrA250cGMEc3RpbWUDMTQ3MjAyN= Tk0Ng--" style=3D"text-decoration: none; color: #2D50FD">Start a New Topic<= /a> </td> <td>•</td> <td style=3D"font-size: 12px; font-family: arial; padding: 7px 5p= x 5px;color: #2D50FD;" > <a href=3D"https://groups.yahoo.com/neo/groups/= win_tech_off_topic/conversations/topics/60563;_ylc=3DX3oDMTM2cHFpazg3BF9TAz= k3MzU5NzE0BGdycElkAzM3MDE1MjQEZ3Jwc3BJZAMxNzA1MDA2NjY5BG1zZ0lkAzYwNTY1BHNlY= wNmdHIEc2xrA3Z0cGMEc3RpbWUDMTQ3MjAyNTk0NgR0cGNJZAM2MDU2Mw--" style=3D"text-= decoration: none; color: #2D50FD;">Messages in this topic</a> (2) </td> </tr> </tbody> </table> =20=20=20=20=20=20=20=20 <div id=3D"megaphoneModule"> <hr style=3D"height:2px ; border-width:0; color:#E3E3E3; backgr= ound-color:#E3E3E3;"> <div> <div class=3D"stream" style=3D"margin-bottom:10px;"> <div style=3D"background-color:white;"> <div class=3D"sn-img" style=3D"display:inline;"><img name=3D"tn= _file" style=3D"padding:0px 10px;vertical-align:top;margin-top:5px;" src=3D= "https://s.yimg.com/ru/static/images/yg/img/megaphone/1464031581_phpFA8bON"= height=3D"82" width=3D"82"></div> <div class=3D"mod-txt" style=3D"display:inline-block;"> <a rel=3D"nofollow" name=3D"sub_url" target=3D"_blank" href= =3D"https://yho.com/1wwmgg" style=3D"color:#0000FF;display:block;margin-lef= t:5px;text-decoration:none;"><span style=3D"font-size:15px;">Have you tried= the highest rated email app?</span></a> <div style=3D"max-width:530px;padding:2px 5px;">With 4.5 st= ars in iTunes, the Yahoo Mail app is the highest rated email app on the mar= ket. What are you waiting for? Now you can access all your inboxes (Gmail, = Outlook, AOL and more) in one place. Never delete an email again with 1000G= B of free cloud storage.</div> </div> </div> </div> </div>=20=20 =20=20=20=20=20 <hr style=3D"height:2px ; border-width:0; color:#E3E3E3; background-col= or:#E3E3E3;"> </div> <!------- Start Nav Bar ------> =20 <!-- |**|begin egp html banner|**| --> <div id=3D"ygrp-vital" style=3D"background-color: #f2f2f2; font-family: Ver= dana; font-size: 10px; margin-bottom: 10px; padding: 10px;"> <span id=3D"vithd" style=3D"font-weight: bold; color: #333; text-transf= orm: uppercase; "><a href=3D"https://groups.yahoo.com/neo/groups/win_tech_o= ff_topic/info;_ylc=3DX3oDMTJlbDdnMmNzBF9TAzk3MzU5NzE0BGdycElkAzM3MDE1MjQEZ3= Jwc3BJZAMxNzA1MDA2NjY5BHNlYwN2dGwEc2xrA3ZnaHAEc3RpbWUDMTQ3MjAyNTk0Ng--" sty= le=3D"text-decoration: none;">Visit Your Group</a></span> <ul style=3D"list-style-type: none; margin: 0; padding: 0; display: in= line;"> </ul> </div> <div id=3D"ft" style=3D"font-family: Arial; font-size: 11px; margin-top: 5p= x; padding: 0 2px 0 0; clear: both;"> <a href=3D"https://groups.yahoo.com/neo;_ylc=3DX3oDMTJkOGQyaWc5BF9TAzk3ND= c2NTkwBGdycElkAzM3MDE1MjQEZ3Jwc3BJZAMxNzA1MDA2NjY5BHNlYwNmdHIEc2xrA2dmcARzd= GltZQMxNDcyMDI1OTQ2" style=3D"float: left;"><img src=3D"http://l.yimg.com/r= u/static/images/yg/img/email/new_logo/logo-groups-137x15.png" height=3D"15"= width=3D"137" alt=3D"Yahoo! Groups" style=3D"border: 0;"/></a> <div style=3D"color: #747575; float: right;"> • <a href=3D"https://i= nfo.yahoo.com/privacy/us/yahoo/groups/details.html" style=3D"text-decoratio= n: none;">Privacy</a> • <a href=3D"mailto:win_tech_off_topic-unsubscri= [email protected]?subject=3DUnsubscribe" style=3D"text-decoration: none;">= Unsubscribe</a> • <a href=3D"https://info.yahoo.com/legal/us/yahoo/uto= s/terms/" style=3D"text-decoration: none;">Terms of Use</a> </div> </div> <br> <!-- |**|end egp html banner|**| --> </div> <!-- ygrp-msg --> =20 <!-- Sponsor --> <!-- |**|begin egp html banner|**| --> <div id=3D"ygrp-sponsor" style=3D"width:160px; float:right; clear:none; m= argin:0 0 25px 0; background: #fff;"> <!-- Start Recommendations --> <div id=3D"ygrp-reco"> </div> <!-- End Recommendations --> </div> <!-- |**|end egp html banner|**| --> <div style=3D"clear:both; color: #FFF; font-size:1px;">.</div> </div> <img src=3D"http://geo.yahoo.com/serv?s=3D97359714/grpId=3D3701524/grpspI= d=3D1705006669/msgId=3D60565/stime=3D1472025946" width=3D"1" height=3D"1"> = <br> <img src=3D"http://y.analytics.yahoo.com/fpc.pl?ywarid=3D515FB27823A7407E&a= =3D10001310322279&js=3Dno&resp=3Dimg&cf12=3DCP" width=3D"1" height=3D"1">=20 <div style=3D"color: #fff; height: 0;">__,_._,___</div> <!--~-|**|PrettyHtmlEnd|**|-~--> </body> <!--~-|**|PrettyHtmlStart|**|-~--> <head> <style type=3D"text/css"> <!-- #ygrp-mkp { border: 1px solid #d8d8d8; font-family: Arial; margin: 10px 0; padding: 0 10px; } #ygrp-mkp hr { border: 1px solid #d8d8d8; } #ygrp-mkp #hd { color: #628c2a; font-size: 85%; font-weight: 700; line-height: 122%; margin: 10px 0; } #ygrp-mkp #ads { margin-bottom: 10px; } #ygrp-mkp .ad { padding: 0 0; } #ygrp-mkp .ad p { margin: 0; } #ygrp-mkp .ad a { color: #0000ff; text-decoration: none; } #ygrp-sponsor #ygrp-lc { font-family: Arial; } #ygrp-sponsor #ygrp-lc #hd { margin: 10px 0px; font-weight: 700; font-size: 78%; line-height: 122%; } #ygrp-sponsor #ygrp-lc .ad { margin-bottom: 10px; padding: 0 0; } #actions { font-family: Verdana; font-size: 11px; padding: 10px 0; } #activity { background-color: #e0ecee; float: left; font-family: Verdana; font-size: 10px; padding: 10px; } #activity span { font-weight: 700; } #activity span:first-child { text-transform: uppercase; } #activity span a { color: #5085b6; text-decoration: none; } #activity span span { color: #ff7900; } #activity span .underline { text-decoration: underline; } .attach { clear: both; display: table; font-family: Arial; font-size: 12px; padding: 10px 0; width: 400px; } .attach div a { text-decoration: none; } .attach img { border: none; padding-right: 5px; } .attach label { display: block; margin-bottom: 5px; } .attach label a { text-decoration: none; } =20=20 blockquote { margin: 0 0 0 4px; } .bold { font-family: Arial; font-size: 13px; font-weight: 700; } .bold a { text-decoration: none; } dd.last p a { font-family: Verdana; font-weight: 700; } dd.last p span { margin-right: 10px; font-family: Verdana; font-weight: 700; } dd.last p span.yshortcuts { margin-right: 0; } div.attach-table div div a { text-decoration: none; } div.attach-table { width: 400px; } div.file-title a, div.file-title a:active, div.file-title a:hover, div.fi= le-title a:visited { text-decoration: none; } div.photo-title a, div.photo-title a:active, div.photo-title a:hover, div= .photo-title a:visited { text-decoration: none; } div#ygrp-mlmsg #ygrp-msg p a span.yshortcuts { font-family: Verdana; font-size: 10px; font-weight: normal; } .green { color: #628c2a; } .MsoNormal { margin: 0 0 0 0; } o { font-size: 0; } #photos div { float: left; width: 72px; } #photos div div { border: 1px solid #666666; height: 62px; overflow: hidden; width: 62px; } #photos div label { color: #666666; font-size: 10px; overflow: hidden; text-align: center; white-space: nowrap; width: 64px; } #reco-category { font-size: 77%; } #reco-desc { font-size: 77%; } .replbq { margin: 4px; } #ygrp-actbar div a:first-child { /* border-right: 0px solid #000;*/ margin-right: 2px; padding-right: 5px; } #ygrp-mlmsg { font-size: 13px; font-family: Arial, helvetica,clean, sans-serif; *font-size: small; *font: x-small; } #ygrp-mlmsg table { font-size: inherit; font: 100%; } #ygrp-mlmsg select, input, textarea { font: 99% Arial, Helvetica, clean, sans-serif; } #ygrp-mlmsg pre, code { font:115% monospace; *font-size:100%; } #ygrp-mlmsg * { line-height: 1.22em; } #ygrp-mlmsg #logo { padding-bottom: 10px; } #ygrp-msg p a { font-family: Verdana; } #ygrp-msg p#attach-count span { color: #1E66AE; font-weight: 700; } #ygrp-reco #reco-head { color: #ff7900; font-weight: 700; } #ygrp-reco { margin-bottom: 20px; padding: 0px; } #ygrp-sponsor #ov li a { font-size: 130%; text-decoration: none; } #ygrp-sponsor #ov li { font-size: 77%; list-style-type: square; padding: 6px 0; }=20 #ygrp-sponsor #ov ul { margin: 0; padding: 0 0 0 8px; } #ygrp-text { font-family: Georgia; } #ygrp-text p { margin: 0 0 1em 0; } #ygrp-text tt { font-size: 120%; } #ygrp-vital ul li:last-child { border-right: none !important;=20 }=20 --> </style> </head> <!--~-|**|PrettyHtmlEnd|**|-~--> </html> <!-- end group email --> --_A8D731A7-739C-42D2-ADAD-54FF17E27CDB_--