Commanding Chaos for Coworking, Open Source and Creative Communities

i broke git :(

Thu, 03/19/2015 - 07:11 -- rprice

i broke git while trying to Pull Changes from my Repo Push my files Pull Changes from my Repo Update my repo with changes from another repo Clone a repo to my computer Create a new Repository Fork a Repo Create a Pull Request Remove Changes from Staging Pull and Merge with minimal conflicts Did you do the following steps? git pull origin (branch name) Merge Conflict? Fix the files locally and then git status git add (fixed filename) git commit -m "Fixed Merge Conflicts" git push origin (branch name)