Quote:
Originally Posted by Phssthpok
Nah, spoken like someone who uses Subversion and can't be bothered moving to git... 
|
I am fairly positive subversion has the concept of merging as well.
Now if you are so used to ancient VCS's that you protest it is impossible to maintain local commits, I would understand where you are coming from, but you are still wrong.
If you are so used to ancient VCS's with substandard tools for managing merge conflicts, duplicate merges, no rebase support, etc. that you think it would be too awkward and you'd rather maintain a series of *.patch'es, and don't plan on doing that either, then I don't have much sympathy, sorry.