merge conflicts #1

[hardin47]

I was working on a paper, and someone else created new folders and reorganized everything in the repo. She put my paper into a different location in the repository.

Problem #1: what should I do in this situation?

Problem #2: what I did was to try to save the paper and then pull her changes. When I realized I'd messed up, I tried just deleting the paper, but every time I would delete and then git stash, git would put the papers back into the original folder. And git wouldn't let me pull anything.

Problem #3: I might have actually saved AND committed. That is worse than just saving, isn't it?

Solution: start over

Bigger question: What happened? I guess the answer to Problem #1 should help me understand what happened. But it seems like I should be able to delete the file and then pull. But by having the commit step in there, it seems impossible to delete.

I have some screen shots if you want to see them. Also, I'm doing almost everything inside of R Studio (not sure if that matters).

Thanks!!!