It happens more often that you may think...
As I arrived at school this morning, I synced my computer with Perforce. I know there would be conflicts, but in like 3 or 4 files. It appeared that a dozen files had conflicts. There were files I didn't even touch, so it was easy to 'revert' my 'non-modifications' so Perforce feels ok, or to tell it to accept 'their' modifications over 'mine'. But it also happened in a file I knew could have been modified. So I ran the resolve tool to check what lines were conflicting. Here it is:
So it actually knows I didn't do anything AND/SO there's no conflict of any kind. What kind of resolver is that? That's one of the things I don't really get when I use Perforce, things that make me regret a bit SVN or Bazaar.
Posted le jeudi, novembre 27 2008, 12:45 - Lien permanent
Commentaires
wow, that's not the first time you talk about the Perforce strange behaviour. I really don't want to try it !
SVN has less features than other modern SCM but it's well supported by IDEs and with meld (http://meld.sourceforge.net) it's a kid's stuff to manage conflicts as you know.
I'm sorry you have to use Perforce :(
It's actually ok. Well, it's more than ok, it's a professional tool. But it's true I had to fight (mostly myself) to understand the software and accept to use it. Now that I know the pitfalls, I only witness strange behaviors like the one above from time to time, but nothing that prevent you from working.
I guess people who used Perfoce first are a bit lost in SVN too...