No, just make a pull request from upstream/2.066 to upstream/master. Or from AndrewEdwards/2.066 to upstream/master I guess. A pull request causes a merge, so it should work in theory.
If if does require special merge steps, then doing the merge in a branch and making a pull request against master should do it as well. On Wed, Aug 20, 2014 at 5:03 PM, Andrew Edwards <[email protected]> wrote: > Not sure how to pull that off. I merge the branch then I ceate a pull > recquest from local master to remote master? Somehow I don't see that > working. But of course I'm not an advanced git user so please provide a > little more detail. > > On Aug 20, 2014 3:51 PM, "Daniel Murphy" <[email protected]> wrote: >> >> Wouldn't making a pull request from the 2.066 branch to master do the >> merge just fine? >> >> On Wed, Aug 20, 2014 at 2:29 PM, Andrew Edwards via dmd-beta >> <[email protected]> wrote: >> > Since 2.066 is released, it is time to merge the branch back to master >> > so I >> > can can start picking for 2.066.1 and branch 2.067. I'm I correct in >> > assuming I should do this directly in the repro or should I be >> > conducting >> > the merge on a fork and submit a pull? Please advise. >> > _______________________________________________ >> > dmd-beta mailing list >> > [email protected] >> > http://lists.puremagic.com/mailman/listinfo/dmd-beta _______________________________________________ dmd-beta mailing list [email protected] http://lists.puremagic.com/mailman/listinfo/dmd-beta
