i broke git :(

I am nobody's puppet.

Disclaimer: My blogs are not a reflection of my employer's opinions, but are my own, and often unfiltered. Also, some links on this site may be part of an Amazon Associates program, so by clicking on them you help me pay for my independence.

[[{"type":"media","view_mode":"media_preview","fid":"25","link_text":null,"attributes":{"alt":"Acquia Certified Developer","title":"I am an Acquia Certified Developer","height":147,"width":147,"style":"width: 60px; height: 60px;","class":"media-image media-element file-media-preview"}}]] [[{"type":"media","view_mode":"media_preview","fid":"15","link_text":null,"attributes":{"height":180,"width":180,"style":"width: 60px; height: 60px;","class":"media-image media-element file-media-preview"}}]] [[{"type":"media","view_mode":"media_original","fid":"13","link_text":null,"attributes":{"height":68,"width":310,"style":"width: 190px; height: 42px;","class":"media-image media-element file-media-original"}}]]

Thanks again, Steve. I hope
14 years 1 month ago
Hi - bit late responding here
14 years 1 month ago
Should have added...
14 years 2 months ago
Hi Ryan,
14 years 2 months ago
Ryan,
14 years 2 months ago
It is happening and you are
14 years 5 months ago
In close future I want to
14 years 8 months ago
the article has been
14 years 9 months ago
I think it's a great coup for
14 years 9 months ago
My hardware box acts as an
14 years 10 months ago

By rprice , 19 March 2015

Link

http://ibrokegit.com/

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)