Git: use revert or checkout to undo pushed changes? - Stack Overflow - 3 views
-
guillaumewp on 21 Nov 12In Short, I often have 20-30 local branches, one for each feature I am working on. They tend to be tested individually first. Occasionally, I create a new branch test and merge everything into that branch and do all the tests together. To track conflicts across branches I use git rerere. The advantage is that I can decide when a feature is stable enough to push to others.