Hi Team, Given the switch to git I am now bit in dilemma on how to handle the PR merge. With svn it was always done by applying the patch and committing it. Keeps history fine. With Git there is choice to 'merge' or rebase.
For external contributors it would be good if commit retains the original author info. So I was thinking to follow approach mentioned in [1]. 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. Note that while closing the PR gitbot adds whole PR diff as comment to the jira So far I liked the way history looked for any module in svn so bit more comfortable with any approach which is closer to that Any guidance here on approach to be taken would be helpful. Chetan Mehrotra PS: Do not want to initiate a never ending discussion around rebase or merge! Just checking what approach we take for our project in general [1] https://mislav.net/2013/02/merge-vs-rebase/
