I prefer rebase over merge

Draft Disclaimer: Please note that this article is currently in draft form and may undergo revisions before final publication. The content, including information, opinions, and recommendations, is subject to change and may not represent the final version. We appreciate your understanding and patience as we work to refine and improve the quality of this article. Your feedback is valuable in shaping the final release.

I prefer rebase over merge

tags: git

At first, didn't really understand but made a lot of sense after a bit of learning

Commits

  • why pull
  • rebase / merge
  • commit
  • how to rebase
git fetch --all
git checkout main
git pull
git checkout feat/login
git rebase main
  • on conflicts
# resolve