Merge vs Rebase vs Cherry Pick
The Merge Option
The easiest option is to merge the main branch into the feature branch using something like the following:
git checkout feature
git merge main
This creates a new “merge commit” in the feature branch that ties together the histories ...
brodevops.hashnode.dev2 min read