trafodion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Selva Govindarajan <>
Subject Merging to Trafodion master - A tip
Date Fri, 08 Jul 2016 14:28:11 GMT
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.


  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message