[vtk-developers] Best way to contribute to VTK ? - Fwd: [GitHub] nolden sent you a pull request from nolden/VTK

Jean-Christophe Fillion-Robin jchris.fillionr at kitware.com
Wed Jul 7 12:06:08 EDT 2010


Here are the options to display a better commit message while merging:

 1) from the integration branch, after you did a git merge your-topic, you
could do a git commit --amend and then change the commit message to
something like "Merge branch awesome_feature  More details about the merge
... "

 2) from integration branch, do a git merge your-topic -m "Merge branch
'awesome_feature' More details about the merge ... "

The "branchy" workflow is nicely described here:
http://public.kitware.com/Wiki/Git/Workflow/Topic#Introduction

Thks
Jc

On Wed, Jul 7, 2010 at 11:46 AM, Marcus D. Hanwell <
marcus.hanwell at kitware.com> wrote:

> I just made two test merges of small branches. It is coming very soon, and
> may already be available to everyone with commit access (although we are
> adding documentation to make the process easier).
>
> Thanks,
>
> Marcus
>
>
> On Wed, Jul 7, 2010 at 11:43 AM, Aashish Chaudhary <
> aashish.chaudhary at kitware.com> wrote:
>
>> Also do we have a date to switch to merge based workflow for VTK?
>>
>> On Wed, Jul 7, 2010 at 11:25 AM, David Gobbi <david.gobbi at gmail.com>wrote:
>>
>>> I have what might be a silly question.  When a branch merge is done,
>>> it shows up simply as "Merge branch" in the logs, and a bit of digging
>>> is required to find out what has changed and why.
>>>
>>> Is there any advantage over doing a merge, as compared to pulling the
>>> changes from the branch, rebasing them, and pushing them?  For
>>> small changes, this would seem preferable over doing a merge, as least
>>> as far as the clarity of the logs is concerned.
>>>
>>>   David
>>>
>>>
>>> On Wed, Jul 7, 2010 at 8:54 AM, Marcus D. Hanwell
>>> <marcus.hanwell at kitware.com> wrote:
>>> > On Tue, Jul 6, 2010 at 1:13 PM, Marco Nolden <
>>> m.nolden at dkfz-heidelberg.de>
>>> > wrote:
>>> >>
>>> >> On 07/06/2010 06:11 PM, Marcus D. Hanwell wrote:
>>> >>>
>>> >>> Sorry if I missed this one, the change looks reasonable and I can
>>> take a
>>> >>> look at it. It would be good to see improved unicode support too. It
>>> is
>>> >>> something that the ARB should probably be discussing, but it would be
>>> >>> great to involve the community as far as is possible.
>>> >>>
>>> >>> Marcus
>>> >>>
>>> >> Actually I revised it a bit, so the link is here:
>>> >>
>>> >>
>>> >>
>>> http://github.com/nolden/VTK/commit/9b76af72e6016fcd4a7b2e1a58edb77eb5549eef
>>> >>
>>> >> and the patch is attached.
>>> >>
>>> > This is now merged, and was actually the first topic branch merged into
>>> VTK
>>> > using the staging repository we have been working on. I actually made a
>>> > second commit in that topic where I fixed the public API to use
>>> unsigned
>>> > char, and also use static_cast instead of the C style casts.
>>> > The commit prefix is normally BUG: rather than FIX: too, although this
>>> is
>>> > something else we need to make clear (are we requiring the log message
>>> > prefixes). Thanks for your patch, I encourage you to keep an eye on the
>>> > dashboards (although I will be doing that too).
>>> > Marcus
>>> > _______________________________________________
>>> > Powered by www.kitware.com
>>> >
>>> > Visit other Kitware open-source projects at
>>> > http://www.kitware.com/opensource/opensource.html
>>> >
>>> > Follow this link to subscribe/unsubscribe:
>>> > http://www.vtk.org/mailman/listinfo/vtk-developers
>>> >
>>> >
>>> >
>>> _______________________________________________
>>> Powered by www.kitware.com
>>>
>>> Visit other Kitware open-source projects at
>>> http://www.kitware.com/opensource/opensource.html
>>>
>>> Follow this link to subscribe/unsubscribe:
>>> http://www.vtk.org/mailman/listinfo/vtk-developers
>>>
>>>
>>
>>
>> --
>> | Aashish Chaudhary
>> | R&D Engineer
>> | Kitware Inc.
>> | www.kitware.com
>>
>
>
> _______________________________________________
> Powered by www.kitware.com
>
> Visit other Kitware open-source projects at
> http://www.kitware.com/opensource/opensource.html
>
> Follow this link to subscribe/unsubscribe:
> http://www.vtk.org/mailman/listinfo/vtk-developers
>
>
>


-- 
Phone: 1-518-836-2174
Ext: 304
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/vtk-developers/attachments/20100707/5d551ec5/attachment-0001.html>


More information about the vtk-developers mailing list