4 ms·
I've never needed to do that. The auto-merge has never failed for me. Give me an example of when you "wouldn't like its auto-merge".
by axod 18y ago
I've never needed to do that. The auto-merge has never failed for me.
Give me an example of when you "wouldn't like its auto-merge".
- jrockway 18y agoAll the time? Sometimes I am working on Bar, and want to update Foo. Unfortuantely, someone changed Bar, and now I have to deal with that change right now no matter what. And, I don't get the opprotunity to decide if I want the change to Bar; svn just auto-merges the changes in. There is nothing I can do to stop that, and no way to revert the change once it's happened. (In git, you can roll-back to any committed state. In svn, you can't even commit if there is a conflict.) Anyway, I am glad you like svn. But it is probably due to some reason other than svn's technical merits like, "at least it doesn't have all these Ruby fanbois." That is totally understandable, ignornat fanboi-ing is VERY off-putting. (To be fair, I started using Git loooong before it was popular. So I don't consider myself a fanboi.) Also, you don't learn anything new by sticking with what you already know. Perhaps it is worth expanding your horizions. Maybe try creating a branch in svn and go from there -- you might like it.
- axod 18y agoFor me, it's like trying to persuade me to use ReiserFS, rather than ext3. I just don't care unless it's performing badly. Why can't you just "svn update Foo" ? Then you don't have to deal with the changes to Bar :/ I don't really see what the issue is. Are you often working on exactly the same files as other developers, and not co-ordinating what you're doing? >> "Anyway, I am glad you like svn. But it is probably due to some reason other than svn's technical merits..." I like it, because it solves my use case perfectly. I'm not quite sure you understand that. I'm not one of these people that love technical solutions for the sake of being technical.
- jrockway 18y agoYou also seem to be intentionally closed-minded, for the purpose of gaining karma on social news sites. I think that's sad, but I realize that it's your loss, not mine.
- axod 18y agoI care not a jot about karma. What I do care about is ill informed people spouting rubbish. You stated that anyone using subversion must not understand revision control. Which is an idiotic comment. I detest this pompous high and mighty tools based attitude. Does anyone not using lisp not understand programming? Anyone not using ruby on rails not understand how to build webapps? I'm actually very open minded. When I have problems with subversion, I'll likely try git if it fits my use case at the time. At the moment, it doesn't.
- jrockway 18y agoYou stated that anyone using subversion must not understand revision control. Which is an idiotic comment. But you said above that you don't want to understand version control; you said you just want to use it. This does not disprove my statement.