Re: Git branches and pull requests
"Christopher Tavares cct-/[email protected] [win_tech_off_topic]" <[email protected]> Wed, 24 Aug 2016 11:49:06 +0000
| Newsgroups | gmane.comp.windows.off-topic |
|---|---|
| Message-ID | <MWHPR04MB03216CD0B0D37EF64BA880EEC4EA0@MWHPR04MB0321.namprd04.prod.outlook.com> |
--_000_MWHPR04MB03216CD0B0D37EF64BA880EEC4EA0MWHPR04MB0321namp_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable In GitHub and in VSO, pull requests track the branch you originated them fr= om. So if you push more commits after opening the PR they will be included = when you eventually merge. On GitHub I've opened PRs and then rebased the b= ranch and did a force push. The PR tracked the head of the branch, and this= followed the rebase. -Chris On Aug 24, 2016 6:24 AM, "John Elliot V [email protected] [win_tech_off_topic]" <= [email protected]> wrote: Hi Andrew. Thanks. So it sounds like we could say that the source of a pull request is passed by reference, not by value. That's annoying. I had planned to create a branch for a sprint, which is a bunch of features, and create pull requests for each feature in the sprint as I go along. But it sounds like I shouldn't edit a branch that has an outstanding pull request... so back to calling my branches by feature name... (and invariably adding unrelated fixes and features in my feature branch...) On 24/08/16 18:05, Andrew Cherry acherry-NWPX/Z+L6M5+PewX70cd0QC/[email protected] [win_tech_off_topic] wrote: > > [Attachment(s) <#TopText> from Andrew Cherry included below] > > In my experience, a pull request merges the state of the source branch > AT THE TIME OF MERGE. > > > > Helpful for addressing PR issues or last minute rebasing, surprising > when you didn't expect the merge to happen just yet. > > > > This is in Github, however; I don't know if VSTS Git behaves differently > - 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] > <mailto:[email protected]> > *Sent: *Wednesday, August 24, 2016 9:51 AM > *To: *[email protected] > <mailto:[email protected]> > *Subject: *[OT] Git branches and pull requests > > > > > > 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 > -- > E: [email protected] > P: +61 4 3505 7839 > W: https://www.jj5.net/ > > > > -- E: [email protected] P: +61 4 3505 7839 W: https://www.jj5.net/ --_000_MWHPR04MB03216CD0B0D37EF64BA880EEC4EA0MWHPR04MB0321namp_ Content-Type: text/html; charset=US-ASCII Content-Transfer-Encoding: 7bit <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html> <head> </head> <body style="background-color: #fff;"> <span style="display:none"> </span> <!--~-|**|PrettyHtmlStartT|**|-~--> <div id="ygrp-mlmsg" style="position:relative;"> <div id="ygrp-msg" style="z-index: 1;"> <!--~-|**|PrettyHtmlEndT|**|-~--> <div id="ygrp-text" > <p> <p dir="ltr">In GitHub and in VSO, pull requests track the branch you originated them from. So if you push more commits after opening the PR they will be included when you eventually merge. On GitHub I've opened PRs and then rebased the branch and did a force push. The PR tracked the head of the branch, and this followed the rebase.</p> <p dir="ltr">-Chris</p> <div class="gmail_extra"><br> <div class="gmail_quote">On Aug 24, 2016 6:24 AM, "John Elliot V [email protected] [win_tech_off_topic]" <[email protected]> wrote:<br type="attribution"> <blockquote class="quote" style="border-left:1px #ccc solid;"> <div style="background-color:#fff;"><span> </span> <div> <div> <div> <p>Hi Andrew. Thanks. So it sounds like we could say that the source of a<br> pull request is passed by reference, not by value. That's annoying. I<br> had planned to create a branch for a sprint, which is a bunch of<br> features, and create pull requests for each feature in the sprint as I<br> go along. But it sounds like I shouldn't edit a branch that has an<br> outstanding pull request... so back to calling my branches by feature<br> name... (and invariably adding unrelated fixes and features in my<br> feature branch...)<br> <br> On 24/08/16 18:05, Andrew Cherry acherry-NWPX/Z+L6M5+PewX70cd0QC/[email protected]<br> [win_tech_off_topic] wrote:<br> > <br> > [Attachment(s) <#TopText> from Andrew Cherry included below]<br> > <br> > In my experience, a pull request merges the state of the source branch<br> > AT THE TIME OF MERGE.<br> > <br> > <br> > <br> > Helpful for addressing PR issues or last minute rebasing, surprising<br> > when you didn’t expect the merge to happen just yet.<br> > <br> > <br> > <br> > This is in Github, however; I don’t know if VSTS Git behaves differently<br> > – but the need to push new commits for PR responses suggests to me it<br> > would not.<br> > <br> > <br> > <br> > Andrew<br> > <br> > <br> > <br> > Sent from my Windows 10 phone<br> > <br> > [10586 - 16.0.7300.4019]<br> > <br> > <br> > <br> > *From: *John Elliot V [email protected] [win_tech_off_topic]<br> > <mailto:[email protected]><br> > *Sent: *Wednesday, August 24, 2016 9:51 AM<br> > *To: *[email protected]<br> > <mailto:[email protected]><br> > *Subject: *[OT] Git branches and pull requests<br> > <br> > <br> > <br> > <br> > <br> > 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_Sprint3<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 for Dev_1.0_JE_Sprint3 to Dev_1.0<br> > 7. Commit a bunch of extra files to local 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/<br> > <br> > <br> > <br> > <br> <br> -- <br> E: [email protected]<br> P: +61 4 3505 7839<br> W: https://www.jj5.net/<br> </p> </div> <div style="color:#fff;height:0;"></div> </div> </div></div></blockquote> </div> <br> </div> </p> </div> <!--~-|**|PrettyHtmlStart|**|-~--> <div style="color: #fff; height: 0;">__._,_.___</div> <div style="clear:both"> </div> <div id="fromDMARC" style="margin-top: 10px;"> <hr style="height:2px ; border-width:0; color:#E3E3E3; background-color:#E3E3E3;"> Posted by: Christopher Tavares <cct-/[email protected]> <hr style="height:2px ; border-width:0; color:#E3E3E3; background-color:#E3E3E3;"> </div> <div style="clear:both"> </div> <table cellspacing=4px style="margin-top: 10px; margin-bottom: 10px; color: #2D50FD;"> <tbody> <tr> <td style="font-size: 12px; font-family: arial; font-weight: bold; padding: 7px 5px 5px;" > <a style="text-decoration: none; color: #2D50FD" href="https://groups.yahoo.com/neo/groups/win_tech_off_topic/conversations/messages/60567;_ylc=X3oDMTJxc2pjY2RwBF9TAzk3MzU5NzE0BGdycElkAzM3MDE1MjQEZ3Jwc3BJZAMxNzA1MDA2NjY5BG1zZ0lkAzYwNTY3BHNlYwNmdHIEc2xrA3JwbHkEc3RpbWUDMTQ3MjAzOTM1MQ--?act=reply&messageNum=60567">Reply via web post</a> </td> <td>•</td> <td style="font-size: 12px; font-family: arial; padding: 7px 5px 5px;" > <a href="mailto:cct-/[email protected]?subject=Re%3A%20%5BOT%5D%20Git%20branches%20and%20pull%20requests" style="text-decoration: none; color: #2D50FD;"> Reply to sender </a> </td> <td>•</td> <td style="font-size: 12px; font-family: arial; padding: 7px 5px 5px;"> <a href="mailto:[email protected]?subject=Re%3A%20%5BOT%5D%20Git%20branches%20and%20pull%20requests" style="text-decoration: none; color: #2D50FD"> Reply to group </a> </td> <td>•</td> <td style="font-size: 12px; font-family: arial; padding: 7px 5px 5px;" > <a href="https://groups.yahoo.com/neo/groups/win_tech_off_topic/conversations/newtopic;_ylc=X3oDMTJlamZqNWp2BF9TAzk3MzU5NzE0BGdycElkAzM3MDE1MjQEZ3Jwc3BJZAMxNzA1MDA2NjY5BHNlYwNmdHIEc2xrA250cGMEc3RpbWUDMTQ3MjAzOTM1MQ--" style="text-decoration: none; color: #2D50FD">Start a New Topic</a> </td> <td>•</td> <td style="font-size: 12px; font-family: arial; padding: 7px 5px 5px;color: #2D50FD;" > <a href="https://groups.yahoo.com/neo/groups/win_tech_off_topic/conversations/topics/60563;_ylc=X3oDMTM2OXV1dTZpBF9TAzk3MzU5NzE0BGdycElkAzM3MDE1MjQEZ3Jwc3BJZAMxNzA1MDA2NjY5BG1zZ0lkAzYwNTY3BHNlYwNmdHIEc2xrA3Z0cGMEc3RpbWUDMTQ3MjAzOTM1MQR0cGNJZAM2MDU2Mw--" style="text-decoration: none; color: #2D50FD;">Messages in this topic</a> (4) </td> </tr> </tbody> </table> <div id="megaphoneModule"> <hr style="height:2px ; border-width:0; color:#E3E3E3; background-color:#E3E3E3;"> <div> <div class="stream" style="margin-bottom:10px;"> <div style="background-color:white;"> <div class="sn-img" style="display:inline;"><img name="tn_file" style="padding:0px 10px;vertical-align:top;margin-top:5px;" src="https://s.yimg.com/ru/static/images/yg/img/megaphone/1464031581_phpFA8bON" height="82" width="82"></div> <div class="mod-txt" style="display:inline-block;"> <a rel="nofollow" name="sub_url" target="_blank" href="https://yho.com/1wwmgg" style="color:#0000FF;display:block;margin-left:5px;text-decoration:none;"><span style="font-size:15px;">Have you tried the highest rated email app?</span></a> <div style="max-width:530px;padding:2px 5px;">With 4.5 stars in iTunes, the Yahoo Mail app is the highest rated email app on the market. 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 1000GB of free cloud storage.</div> </div> </div> </div> </div> <hr style="height:2px ; border-width:0; color:#E3E3E3; background-color:#E3E3E3;"> </div> <!------- Start Nav Bar ------> <!-- |**|begin egp html banner|**| --> <div id="ygrp-vital" style="background-color: #f2f2f2; font-family: Verdana; font-size: 10px; margin-bottom: 10px; padding: 10px;"> <span id="vithd" style="font-weight: bold; color: #333; text-transform: uppercase; "><a href="https://groups.yahoo.com/neo/groups/win_tech_off_topic/info;_ylc=X3oDMTJlOGQ3dnM2BF9TAzk3MzU5NzE0BGdycElkAzM3MDE1MjQEZ3Jwc3BJZAMxNzA1MDA2NjY5BHNlYwN2dGwEc2xrA3ZnaHAEc3RpbWUDMTQ3MjAzOTM1MQ--" style="text-decoration: none;">Visit Your Group</a></span> <ul style="list-style-type: none; margin: 0; padding: 0; display: inline;"> </ul> </div> <div id="ft" style="font-family: Arial; font-size: 11px; margin-top: 5px; padding: 0 2px 0 0; clear: both;"> <a href="https://groups.yahoo.com/neo;_ylc=X3oDMTJkaTJ2dTlwBF9TAzk3NDc2NTkwBGdycElkAzM3MDE1MjQEZ3Jwc3BJZAMxNzA1MDA2NjY5BHNlYwNmdHIEc2xrA2dmcARzdGltZQMxNDcyMDM5MzUx" style="float: left;"><img src="http://l.yimg.com/ru/static/images/yg/img/email/new_logo/logo-groups-137x15.png" height="15" width="137" alt="Yahoo! Groups" style="border: 0;"/></a> <div style="color: #747575; float: right;"> • <a href="https://info.yahoo.com/privacy/us/yahoo/groups/details.html" style="text-decoration: none;">Privacy</a> • <a href="mailto:win_tech_off_topic-unsubscribe-hHKSG33TihhbjbujkaE4pw@public.gmane.org?subject=Unsubscribe" style="text-decoration: none;">Unsubscribe</a> • <a href="https://info.yahoo.com/legal/us/yahoo/utos/terms/" style="text-decoration: none;">Terms of Use</a> </div> </div> <br> <!-- |**|end egp html banner|**| --> </div> <!-- ygrp-msg --> <!-- Sponsor --> <!-- |**|begin egp html banner|**| --> <div id="ygrp-sponsor" style="width:160px; float:right; clear:none; margin:0 0 25px 0; background: #fff;"> <!-- Start Recommendations --> <div id="ygrp-reco"> </div> <!-- End Recommendations --> </div> <!-- |**|end egp html banner|**| --> <div style="clear:both; color: #FFF; font-size:1px;">.</div> </div> <img src="http://geo.yahoo.com/serv?s=97359714/grpId=3701524/grpspId=1705006669/msgId=60567/stime=1472039351" width="1" height="1"> <br> <img src="http://y.analytics.yahoo.com/fpc.pl?ywarid=515FB27823A7407E&a=10001310322279&js=no&resp=img&cf12=CP" width="1" height="1"> <div style="color: #fff; height: 0;">__,_._,___</div> <!--~-|**|PrettyHtmlEnd|**|-~--> </body> <!--~-|**|PrettyHtmlStart|**|-~--> <head> <style type="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; } 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.file-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; } #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; } --> </style> </head> <!--~-|**|PrettyHtmlEnd|**|-~--> </html> <!-- end group email --> --_000_MWHPR04MB03216CD0B0D37EF64BA880EEC4EA0MWHPR04MB0321namp_--