A quick look at some more options in how to resolve conflicts, what happens when conflicts happen with uncommitted changes, and a rant where I complain about things. https://github.com/Inarus899/2024_episode_notes/blob/main/git_part_3.txt
Right-click 'Download' and select 'Save Link As' if the file opens in a new tab.
