merge conflict tips

(this is #bonuscomic #5 for "How Git Works" https://wizardzines.com/zines/git/, with things that aren't in the zine)

I've been breaking my usual "don't write about things I haven't tried" rules for these bonus comics, but other people suggested these and maybe they'll be helpful!

git add -p

(this is #bonuscomic #4 for "How Git Works" https://wizardzines.com/zines/git, covering some topics that I didn't have space for in the zine)

https://wizardzines.com/comics/git-add-p/

git worktree

(this is #bonuscomic #3 for "How Git Works" https://wizardzines.com/zines/git, covering some topics that I didn't talk about in the zine)

Also I don't use worktrees much, so please reply with gotchas/tips about worktrees if you use them more!

https://wizardzines.com/comics/git-worktree/

git submodules

(this is #bonuscomic #2 for "How Git Works" https://wizardzines.com/zines/git, covering some topics I didn't talk about in the zine!)

https://wizardzines.com/comics/submodules/

interactive rebase

(this is #bonuscomic #1 for How Git Works https://wizardzines.com/zines/git, covering some topics that didn't make it into the zine!)

https://wizardzines.com/comics/interactive-rebase/

Ask Nega (Nega explains the universe) 001

https://megamaiden.com/comic/ask-nega-001/

#megamaiden #NegaExplainsTheUniverse #bonuscomic #webcomics