[p4] P4V Merge issues - Files not resolving when accepting merged file
p4rfong <[email protected]>
| Newsgroups | gmane.comp.version-control.perforce |
|---|---|
| Message-ID | <[email protected]> |
Posted on behalf of forum user 'p4rfong'. The "Accept Merge" will not always resolve conflicts where a change on the source file and the target file are on the same line. Perforce does not know who wins, the person submitting the change or the edit on the target who made a change to the same line. You will have to use "Run Merge Tool" to manually resolve the change. -- Please click here to see the post in its original format: http://forums.perforce.com/index.php?/topic/5485-p4v-merge-issues-files-not-resolving-when-accepting-merged-file _______________________________________________ perforce-user mailing list - [email protected] http://maillist.perforce.com/mailman/listinfo/perforce-user