A Basic Git Workflow for Smaller Projects
1–3 of 3 posts
Re: A Basic Git Workflow for Smaller Projects
#2I like this workflow. When I'm ready to merge a feature branch into master, I generally do it this way to simplify the history on master:
git switch master
git merge --squash feature
git commit -m Re: A Basic Git Workflow for Smaller Projects
#3I like this workflow. When I'm ready to merge a feature branch into master, I generally do it this way to simplify the history on master: git switch master git merge --squash feature git commit -m
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.