Your browser was unable to load all of the resources. They may have been blocked by your firewall, proxy or browser configuration.
Press Ctrl+F5 or Ctrl+Shift+R to have your browser try again.

unable to use shelved changelist with merge conflicts #3547

rmondragon · 8 years ago

So I want to use a shelved changelist in a build that I know will have merge conflicts, but for this particular file type we always accept yours. It seems that the default behavior of the "merge with shelved changelist" option is to do a resolve with -am, is there anyway to change this? If not, can we get a feature for optional resolve types?

Also, it appears the unshelving happens before the file sync, shouldn't that be the other way around?

Thanks

replies 1
views 2999
stars 0

robinshen ADMIN · 8 years ago

Please file an improvement request for conflict resolving option. The unshelving has to happen before file sync according to my test, as otherwise, perforce will not try to do the merge between synced file and unshelved file.