[Scons-dev] pull requests

[anatoly techtonik]

On Mon, Mar 10, 2014 at 8:41 PM, Russel Winder <russel at winder.org.uk> wrote:

> On Mon, 2014-03-10 at 13:18 -0400, Gary Oberbrunner wrote:

> […]

>> I believe you can keep making changes on top of your pull request.

>> The PR gets a message saying the branch has been updated and would you

>> like to update the pull request? but as long as nobody says yes to

>> that prompt (as I did once before I learned what it meant) everything

>> seems to work.

>

> I guess the difficult situation is where there are changes that amend

> the pull request, but this is not the case here I suspect.

>

>> If the merge into the master repo requires additional changes (which

>> it sometimes does), then when you merge that back into your code you

>> may have to deal with those of course.

>

> This is not the most likely of problems :-)

>

> I formally issue a pull request and we can see what happens. Hopefully

> not the mess of last time.


Until there are no conflicts with mainline, there is no need to update PR at
all. At some point you may need to rebase your fork, but only if it touches
the files that were modified outside. Only to make reviews easier.
-- 
anatoly t.