Using git to make a branch, compare that branch back to the master branch, and resolve conflicts FEELS like magic but it isn't. Being able to use this sophisticated workflow tool is a valuable skill that you can master too.
After teaching challenging STEM courses at the college level for decades, I believe that this is one of the most important things for college students to learn.
So, don't expect the important stuff to work right the first time--plan for revisions, practice, and improvement!