I'm a git novice but I want to start adopting better practices.
I was able to follow some of the resources from Jenny Bryan (Chapter 28 Pull, but you have local work | Happy Git and GitHub for the useR), but I have some questions.
First, what does the syntax "A--B--C" refer to? I gather that "A", "B", "C" are files, but what does the presence or absence of the letter mean, and what do the dashes mean?
Second, I have succesfully made some repos and and commits and pushes in the past, but I never had to merge. I was always working on different files from my colleagues. The book refers to a git merge "kicking you to a text editor". What exactly does that mean?
Remote: A--B--C Local before 'git pull': A--B--(uncommitted changes) Local after 'git pull': A--B--C--(uncommitted changes)