Good tutorials on git branching. The “Git Branching” chapter of Pro Git book is the best one that I ever seen: http://git-scm.com/book/en/Git-Branching It deserve the time to study the whole chapter. If you are working with a git server, this chapter is especially useful: http://git-scm.com/book/en/Git-Branching-Remote-Branches Answered by Eric Z Ma.
I merge a branch, say b1, from another branch, say b2. Both b1 and b2 have some commits. Say, b1: c1 —> c2 —> c3 b2: c1 —> c4 —> c5 Now, if I merge b2 to b1 and there is no conflicts, b1’s history includes b2’s commits (c4, c5). How to revert this merge […]
I made some changes in my local copy of the svn repository. I have not committed and updated the server yet. Now I want to discard my updates. How to revert my changes in my local copy of the repository? To discard current updates, run this in the root directory of the repository: svn revert […]