merging vs rebasing code example
Example: VS github merge
// Go to the main branch you want the side branch to be merged to
git checkout <Main branch name>
// Merge your side branch
git merge <Side branch name>
// Go to the main branch you want the side branch to be merged to
git checkout <Main branch name>
// Merge your side branch
git merge <Side branch name>