Jump to content


merge problem - it wants to merge two files with completely different paths/names?

merge

  • Please log in to reply
1 reply to this topic

#1 sabibo

sabibo

    Newbie

  • Members
  • Pip
  • 2 posts

Posted 22 January 2020 - 07:06 PM

We're trying to update our Unreal source build to a new version.  When setting up a merge/integrate files between a parent/child stream, it gives us a list of files to resolve.  The first couple of files in the list have completely different path and file names from the files it wants to resolve with.  Why would that happen?  Why would it think it needs to resolve one with with a completely different file?  Is that a bug or is there some way that can actually happen?


It seems to be failing to do the resolves, also.  If we mark a few other files to 'accept source' for example, it pretends to do it but then comes back with the same entire list of files.  It doesn't seem to change.

Anyone recognize this behavior?  It is preventing us from being able to merge this new update...
Thanks!

#2 Sambwise

Sambwise

    Advanced Member

  • Members
  • PipPipPip
  • 1038 posts

Posted 01 February 2020 - 05:08 PM

Go to the command line, run “p4 resolve -n”, and paste the output here?  That’ll help me get an idea of what it is you’re trying to merge.  If the source/target file names are different, it usually means that the file got renamed and the two names are being reconciled automatically as part of the merge (that’ll show up in the output as “resolving filename” and it’ll say what the two names are).

If you want to “accept source” on everything, you could follow it up with “p4 resolve -at” and see if that works any better than what you tried in P4V.





Also tagged with one or more of these keywords: merge

0 user(s) are reading this topic

0 members, 0 guests, 0 anonymous users