Hi Chetan, On Wed, Nov 1, 2017 at 6:04 AM, Chetan Mehrotra <chetan.mehro...@gmail.com> wrote: > ...In brief use > - `git merge --no-ff feature` for feature branches involving multiple commits > - `git cherry-pick feature` for simple bug fixes > > Used this for SLING-7223....
I like this, the commit at [1] says "mreutegg committed with chetanmeh" which is exactly what we want IMO. > ... Note that while closing the PR gitbot adds whole PR diff as comment to > the jira... That's quite noisy, I'd prefer a link to the commit, but we can look at that separately. -Bertrand [1] https://github.com/apache/sling-org-apache-sling-commons-metrics-rrd4j/commit/d6d22d0f6f431e2f9c2bf465833cf3831095636d
