note 1

Table of Contents

git checkout to resolve conflict when you pull and its behind

potate

using magit to manage the git on this testing it out. trying to get used to emacs

argg i hate rebabasing and fast forwarding git merge conflicts are such a headache it sucks so much when you accidentally push before pulling

okay this time il try magit again
editing it on github to test pulling from magit trying to push again from here *******
now once again changing it so i can hit it with fugitive

and finally again, were in vim using git commands in the terminal to stage changes and push them back up to github.