hadoop-yarn-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Sangjin Lee <sj...@apache.org>
Subject Re: feature branch merge policy
Date Fri, 17 Jun 2016 03:14:16 GMT
Thanks Andrew for jogging my memory on this!

Sangjin

On Thu, Jun 16, 2016 at 3:21 PM, Andrew Wang <andrew.wang@cloudera.com>
wrote:

> This vote from last year covers some of it, says to use "git merge
> --no-ff" and tags. With merge, I believe the history is propagated
> correctly.
>
>
> https://lists.apache.org/thread.html/43cd65c6b6c3c0e8ac2b3c76afd9eff1f78b177fabe9c4a96d9b3d0b@1440189889@%3Ccommon-dev.hadoop.apache.org%3E
>
> I never got around to adding this text to the website though, TODO.
>
> Best,
> Andrew
>
> On Thu, Jun 16, 2016 at 2:09 PM, Sangjin Lee <sjlee@apache.org> wrote:
>
>> Hi folks,
>>
>> Is there a standard policy for merging a feature branch onto trunk? I'm
>> specifically looking for answers for
>> - How is the commit done? Squash commit? Patch? Something else?
>> - What should the commit message contain?
>> - Do we preserve the feature branch after the commit for the commit
>> history, now that we don't do CHANGES.txt?
>>
>> I tried searching the mailing list, but couldn't find a standard policy
>> for
>> this. Thanks!
>>
>> Regards,
>> Sangjin
>>
>
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message