search

EndPointCorp / end-point-blog

End Point Dev blog
https://www.endpointdev.com/blog/
17 stars 65 forks source link

Comments for Hopefully Useful Techniques for Git Rebase #341

Open phinjensen opened 6 years ago

phinjensen commented 6 years ago

Comments for https://www.endpointdev.com/blog/2010/08/hopefully-useful-techniques-for-git/ By Ethan Rowe

To enter a comment:

  1. Log in to GitHub
  2. Leave a comment on this issue.
phinjensen commented 6 years ago 
original author: Sonny Cook
date: 2010-08-20T12:03:51-04:00

I generally feel like a loser when I spend a lot of time handling administrative tasks like this, so this post makes me feel a lot better. There are a couple of things that tend to save me when I have problems while doing semi-complex rebases or merges.

  1. tar - I just back up the whole repository if it seems likely that I might do irreparable harm to it.

  2. git-reset - If a merge, rebase, or (especially common for me) conflict resolution starts going south, git reset can put your repo back to a good known place

  3. the guts - there are all sorts of goodies in the .git directory and as you start to get a handle on what the various parts mean, behavior become less magicky and more rational. Also, you don't have to rely on the above 2 as much.

phinjensen commented 6 years ago 
original author: FallenGameR
date: 2012-04-16T15:07:28-04:00

Thanks for the post.