RE: [DISCUSS] merging vs. cherry-picking

2014-10-31 Thread Vaibhav Gupta
d not be hacked to address this. Thanks, Vaibhav -Original Message- From: Rajani Karuturi [mailto:raj...@apache.org] Sent: 31 October 2014 12:35 To: dev@cloudstack.apache.org Subject: [DISCUSS] merging vs. cherry-picking I am one of those who hate cherry-picking. Though both have same conf

[DISCUSS] merging vs. cherry-picking

2014-10-31 Thread Rajani Karuturi
I am one of those who hate cherry-picking. Though both have same conflicts and the same number of commits, merging has many advantages over cherry-picking. git cherry-pick creates two physically distinct commits and its very difficult to track it over time [1]. git branch --contains commit-id can