[vtk-developers] New instructions in gitlab merge info

[Bill Lorensen]

No problem. Just a suggestion.

I do have my own workflow now. I find the best thing for me is:
download the email patch from the download drop down
git checkout -b topic-name
git am the-email-patch


On Fri, Apr 3, 2015 at 1:33 PM, Brad King <brad.king at kitware.com> wrote:
> On 04/03/2015 04:20 PM, Bill Lorensen wrote:
>> I think if this was changed to
>>
>> Fetch the branch and create a topic with git fetch
>> https://gitlab.kitware.com/lorensen/vtk.git TestRIBExporter && git
>> checkout FETCH_HEAD -b TestRIBExporter
>>
>> a topic with the proper name would be created.
>
> As explained in the discussion here:
>
>  https://gitlab.kitware.com/vtk/vtk/merge_requests/15#note_9263
>
> I don't think we should put the post-fetch part of the command
> line on the page.  How a developer looks at the changes after
> fetching is a personal workflow choice.  Furthermore, there is
> no single command one can put there that will always work without
> risking loss of work.  Checkout with "-b" will fail if the branch
> exists.  Checkout with "-B" will work but may lose work.  Also
> there is no reason the reviewer has to use the same branch name.
>
> This is a change we're trying to get upstreamed to GitLab, and
> GitLab should not endorse a particular post-fetch workflow.
>
> The reviewer instructions have already been updated to show a few
> options for checking out the changes:
>
>  https://gitlab.kitware.com/vtk/vtk/blob/22bcdc7c/Documentation/dev/git/develop.md#fetching-changes
>
> including your preferred cherry-pick approach.
>
> -Brad
>



-- 
Unpaid intern in BillsBasement at noware dot com