hadoop-common-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Andrew Wang <andrew.w...@cloudera.com>
Subject Re: feature branch merge policy
Date Thu, 16 Jun 2016 22:21:15 GMT
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.


I never got around to adding this text to the website though, TODO.


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

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