We've previously established a best practice of committing to trunk and cherry picking back to branches whenever possible. When there is a minor conflict we can fix it up and proceed with the commit. The resulting commit retains the original author. When the amending author is different from the original committer, I propose adding notice of this at the end of the commit message as:
Amending-Author: Author <committer@apache>
Thoughts? Best regards,
Problems worthy of attack prove their worth by hitting back. - Piet Hein (via Tom White)
Re: [DISCUSSION] Best practice when amending commits cherry picked from master to branch
I added note under committing section in dev chapter referencing this thread. St.Ack On Fri, Jun 6, 2014 at 2:47 PM, Enis Söztutar <[EMAIL PROTECTED]> wrote:
NEW: Monitor These Apps!
Apache Lucene, Apache Solr and all other Apache Software Foundation projects and their respective logos are trademarks of the Apache Software Foundation.
Elasticsearch, Kibana, Logstash, and Beats are trademarks of Elasticsearch BV, registered in the U.S. and in other countries. This site and Sematext Group is in no way affiliated with Elasticsearch BV.
Service operated by Sematext