Stephen Taylor

Thanks, I give it a try next time. It seamed to me that the dialog boxes that continue to pop up couldn't be cancelled but perhaps if I can get focus and cancel the whole merge it will stop them, I'm not sure until I see the dialogs again though.

Thanks, often if you are not paying too much attention it can be too late to do this as you have already embarked on processing all the merges. Then there is no way to cancel and go back to do this process as you are faced with a never ending list of dialog pop ups asking which version you want to take.

Currently when resolving a merge we might have hundreds of files which all need to be reolved the same way, e.g always take source. Once you start processing the merge we currently keep getting lots of pop up dialogs for each instance. Please can we have a button or tick box on the dialog to do this action of all the cases? Thanks.

If she does as suggested above the file appears locally as a private file. It still doesn't register it already being under plaster source control. Different Artists aren't getting this issue. Thanks, Stephen.

Hi, They are using Plastic SCM not Gluon. Is there a plastic SCM equivalent? What else could cause this in Plastic SCM?

Hi, One of our artists has created a new work space and in one folder a particular .mb file isn't present, all the other .mb file are present. t's there if they browse the repository at the latest changeset submitted to main. There is no mention of this file in any ignore, cloaked of hidden_files file. If we look at the history of the file from the browse repository then non of the file changeslist numbers are in bold. There is nothing in their pending chnages. I.e no deletes. Updating the workspace doesn't fix it. Adding a new file to this folder and merging from main and it appears fine. What could be causing this? Thanks, Stephen.

If some reverts a file it only shows the CL number in bold that it's been reverted to in the file history. This is confusing and it should dhow the CL number as the operation does have a CL which you can see in the branch view. This makes it difficult to look through the history and see someone has done a reversion. It is also not entirely obvious that the reversion is going to stick when merged in from another branch. The same can be said for a subtractive merge. We have just had a case where so changes were being reverted when merging from main and we couldn't understand why. It turns out that someone had done an accidental subtractive merge in another branch and subbed it to main. When looking in the file in questions history that operation wasn't visible so it was really hard to track. Please can subtractive merges and revertions be listed with a CL number just like any other operation to make tracking down this sort of thing easier. Thanks, Stephen.

Do you think it would it be better to bring up a different warning dialog though rather than silently create this private.0 file?

Hi, If I merge from a branch which has the same file in it that I also have locally but not added, then the file from the branch I am merging from takes precedence and my local file gets renamed to myfile.private.0. Why doesn't this just create an evil twin conflict like it does if my local file had been submitted to my branch? Or at least pop up a dialog to get you to choose which file you want. Creating a private.0 file is not a very intuitive way of explaining what has happened. Cheers, Stephen.