git merge and git rebase both reconcile the difference between the two branches (“feat” and “main”).
git merge creates a new merge commit in the “feat” branch that ties together the histories of the “main” branch and the “feat” branch. Use git merge when you want to preserve individual commit histories across branches.
git rebase modifies the existing commits of the “feat” branch. Use git rebase when you want to maintain a clean commit history. However, avoid using git rebase on shared branches to avoid potential conflicts.
