Re: [p4] How to resolve conflicts between same filename added by two different clients?
tmcsweeney <[email protected]>
| Newsgroups | gmane.comp.version-control.perforce |
|---|---|
| Message-ID | <[email protected]> |
Posted on behalf of forum user 'tmcsweeney'. Yay! that works a treat. Now all I need to do is turn that into a script that does the steps automatically and can be added as a custom tool in P4V Thank you. -- Please click here to see the post in its original format: http://forums.perforce.com/index.php?/topic/5453-how-to-resolve-conflicts-between-same-filename-added-by-two-different-clients _______________________________________________ perforce-user mailing list - [email protected] http://maillist.perforce.com/mailman/listinfo/perforce-user