Further reading
To learn more about the topics that were covered in this chapter, take a look at the following resources:
- Scott Chacon, Ben Straub: Pro Git, 2nd Edition (2014): https://git-scm.com/book/en/v2:
- Chapter 3.6, Git Branching – Rebasing
- Chapter 7.8, Git Tools – Advanced Merging
- Chapter 7.9, Git Tools – Rerere
- Julia Evans, git rebase: what can go wrong? (2023): https://jvns.ca/blog/2023/11/06/rebasing-what-can-go-wrong-/
- Julia Evans, How git cherry-pick and revert use 3-way merge (2023): https://jvns.ca/blog/2023/11/10/how-cherry-pick-and-revert-work/
- Junio C Hamano, Where do evil merges come from? (2013): https://git-blame.blogspot.com/2013/04/where-do-evil-merges-come-from.html
- Nick Quaranto, git ready – keep either file in merge conflicts (2009): https://gitready.com/advanced/2009/02/25/keep-either-file-in-merge-conflicts.html
- Learn to use email with git!: https://git-send-email.io/
