Quoted By:
I'm having trouble updating. When I first tried it said I modified a long list of files and wouldn't merge. Googled it and did a few things and now get this when I try. I have tried git stash, git reset --hard, and git checkout 2f47724(I guess that's the current branch?). All still bring me back to this.