Using --rebase

git pull origin main --rebase

One of my favourite git commands. It retrieves the latest changes from a remote repository and rebases them onto your local branch.

This helps to avoid creating unnecessary merge commits and ensures a cleaner and more linear commit history. It's particularly useful in team projects where multiple developers are making changes to the same codebase simultaneously, as it helps to avoid merge conflicts and maintain a consistent codebase. While there may be situations where using git merge is more appropriate, git pull origin main --rebase is a valuable tool for advanced users who want to manage changes in their codebase more efficiently.