Imagine if when you made a Git branch and then attempted to merge back to master that you got errors saying that it could not complete. Even after trying all yo

Imagine if when you made a Git branch and then attempted to merge back to master that you got errors saying that it could not complete. Even after trying all your Git Foo. In other words, that you would now have to checkout the main trunk of the project and manually merge your changes (by backing up your failed branch with a file system copy). Yes, svn merge and svn reintegrate usually work but there are times where the entire process completely fails and makes you want to do shots at 3pm on a Monday. (Good luck if someone deleted files you have in your private branch!) You Git developers have it good. Branching is like breathing to Git, while it is like a dental checkup in SVN. I prefer Git and avoid svn branching since it is like touching a hot stove. So basically I have to keep up with the SVN trunk and I cannot merge WIP because I am not on a private branch. To keep me sane.