This discussion applies more to the committer side of the workflow, rather than the development side. https://cwiki.apache.org/confluence/display/TRAFODION/Merge+Changes Though the developer can certainly squash a branch before submitting the initial PR.
There is a small note on the committer page already about squash option, but I'll add a bit more info on the trade-offs. --Steve > -----Original Message----- > From: Dave Birdsall [mailto:[email protected]] > Sent: Monday, July 11, 2016 8:41 AM > To: [email protected] > Subject: RE: Merging to Trafodion master - A tip > > Could someone add this information to the Trafodion Contributor Guide? > > https://cwiki.apache.org/confluence/display/TRAFODION/Development+Workfl > ow > > -----Original Message----- > From: Steve Varnau [mailto:[email protected]] > Sent: Friday, July 8, 2016 9:56 AM > To: [email protected] > Subject: RE: Merging to Trafodion master - A tip > > Yes, squashing a PR into a single commit does give a better indication of > what all files were modified in a change-set. Some projects do that as a > regular practice. It does, however, break from the history with the > original commits, so committers using squash need to take extra care to > put > good information into the commit message about the original author and > edit > the original commit messages' content. > > --Steve > > > > -----Original Message----- > > From: Selva Govindarajan [mailto:[email protected]] > > Sent: Friday, July 8, 2016 7:28 AM > > To: [email protected] > > Subject: Merging to Trafodion master - A tip > > > > While merging the change to master involving multiple commits for a > > pull request (PR) I think it would be better to use --squash option. > > Most often multiple commits are made to address the review comments. > > Squashing these multiple commits into one eases the process of cherry > > picking the change to a different branch. Otherwise one has to > > cherry-pick every commit of the PR to ensure that the change is > > properly merged to the destination. This can be easily overlooked > > causing problems on the destination branch. > > > > > > > > Selva
