[p4] How to see the conflits on pending change list during merge

[Michael Mirman]

From the command line, you can run "p4 resolve -am" to get auto-merges done.
After that, "p4 resolve -n" will show you the files with conflicts.
Unfortunately, I don’t know the way to get the files with conflicts without doing -am first.
If anyone knows some trick, please let me know.
--
Michael Mirman
MathWorks, Inc.
3 Apple Hill Drive, Natick, MA 01760
508-647-7555

-----Original Message-----
Behalf Of Bhargav
Sent: Wednesday, January 11, 2017 12:40 PM
Subject: [p4] How to see the conflits on pending change list during merge
Posted on behalf of forum user 'Bhargav'.
Im doing merge/integrate from one stream to other, it has some conflicts
and and
created pending change list. Pending has more than 10000 files.Because of
the
long list of files they are are not visible in GUI. How to see the conflict
files in GUI or command line.
Please help me to identify the conflicts
--
http://forums.perforce.com/index.php?/topic/5125-how-to-see-the-
conflits-on-pending-change-list-during-merge
_______________________________________________
http://maillist.perforce.com/mailman/listinfo/perforce-user

_______________________________________________
perforce-user mailing list - perforce-***@perforce.com
http://maillis

[Gabor Maghera]

If you go into P4V's preferences, you can raise the limit of files that it
will show in change lists. By default it's set to 1,000.

On Wed, Jan 11, 2017 at 11:40 AM Sambwise <
perforce-user-***@forums.perforce.com> wrote:

Posted on behalf of forum user 'Sambwise'.





In theory you could run "p4 resolve", "skip" for each file,


and keep count of the "conflicting" chunks -- hard to script since it


involves answering prompts, but wouldn't be hard with the


API. Slow, though, because the merged file is being sent to the


client (only to be discarded)! If you're planning to accept


the merges anyway, better to just do the "-am".





I forget if you can do this from P4V yet, but I know in P4Win you can
auto-merge


the entire pending changelist and then sort by resolve status so that the


remaining (conflicted) files are up at the top -- that's the way I always


did large merges. :)











--


Please click here to see the post in its original format:



http://forums.perforce.com/index.php?/topic/5125-how-to-see-the-conflits-on-pending-change-list-during-merge


_______________________________________________


perforce-user mailing list - perforce-***@perforce.com


http://maillist.perforce.com/mailman/listinfo/perforce-user
_______________________________________________
perforce-user mailing list - perforce-***@perforce.com
http://maillist.perforce.com/mailman/listinfo/perf