Re: [p4] How to resolve conflicts between same filename added by two different clients?
Sambwise <[email protected]>
| Newsgroups | gmane.comp.version-control.perforce |
|---|---|
| Message-ID | <[email protected]> |
Posted on behalf of forum user 'Sambwise'. I'm pretty sure there's a feature request in there to have "p4 sync" set up a baseless resolve for you when you get in this situation, which would be the ideal behavior IMO. But as a workaround you can take advantage of the fact that "p4 unshelve" does the right thing here: #561180 (Bug #52246) ** 'p4 unshelve' to open a file for add will schedule a baseless merge and open the file for edit if the file already exists in the depot. So if you shelve your add, revert, sync, and then unshelve, you should get that baseless resolve you're looking for. -- 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