search

githubteacher / cloaked-octo-shame

Practice repository for collecting common Git and GItHub tips
4 stars 2 forks source link

Added a GitHub blog post #33

Closed casche closed 9 years ago

casche commented 9 years ago

Looks like a great blog post on how to remove anything in Git. @githubstudent I'd like to add this link.

githubteacher commented 9 years ago

@casche can you follow the steps above to resolve this conflict :smile:

casche commented 9 years ago

hey @githubteacher what's with this error? :cry:

$ git checkout -b casche-useful-links origin/casche-useful-links fatal: A branch named 'casche-useful-links' already exists.

casche commented 9 years ago

hey thanks @githubteacher for resolving the conflict :+1:

githubteacher commented 9 years ago

@casche i went ahead and did the following:

git pull
git checkout  casche-useful-links
git merge useful-links
(resolved conflict)
git push