Re:A Basic Git Workflow for Smaller Projects
by peterjussi on Tuesday March 24, 2020 @07:17PM
(#22680100)
Right, the main difference there would be that the changes get combined into one squash commit rather than a merge commit. Mostly an aesthetic choice, so I could definitely see both as viable.
If I wanted to move changes between branches I would probably prefer a squash rather than a regular merge, as that will look cleaner in the history.
If I wanted to move changes between branches I would probably prefer a squash rather than a regular merge, as that will look cleaner in the history.