[vtk-developers] Cherry picking
bill.lorensen at gmail.com
Tue Mar 17 17:05:39 EDT 2015
Yes, the point is to not have to rebuild everything. I have slow
computers. I guess I have an unusual workflow.
1) I keep my local copy up-to-date with master.
2) I almost always cherry pick and rebase on master.
3) Testing is better since I always test against master. This points
out errors and conflicts against master.
If I see need for many changes, I used to summit a new patch to the
For me, the new workflow is less productive.
I will give it a try. But I suspect my contributions will drop off.
On Tue, Mar 17, 2015 at 1:01 PM, Ben Boeckel <ben.boeckel at kitware.com> wrote:
> On Tue, Mar 17, 2015 at 15:08:23 -0400, Brad King wrote:
>> You could also just create a temporary branch to merge the topic
>> you're reviewing:
>> $ git checkout -b try-theirs
>> $ git merge gl/$username/$branch
>> (test it)
>> $ git checkout -
>> (should switch back to where you were)
>> $ git branch -D try-theirs
> I think the point was to get *just* their changes on top of what has
> already been built so as to not have to rebuild everything. Fine for
> review, not for actual testing.
Unpaid intern in BillsBasement at noware dot com
More information about the vtk-developers