Jump to content
Sign in to follow this  
Stephen Taylor

Why are Private.0 files created?

Recommended Posts

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.

Share this post


Link to post
Share on other sites

Hi,

If you have a private file in your workspace with the same name, but it's not under source control, Plastic can't resolve any evil twin merge. The way Plastic handles it is renaming it to .private. This way, your local file is overwritten.

If Plastic was aware of this file, it will perform an evil-twin merge but if the file is private (not under source control), Plastic can't merge it.

Regards,

Carlos.

Share this post


Link to post
Share on other sites

Yes, I agree that we may need to include a better explanation regarding what's happening. Maybe a message explaining the user why we are renaming the files to .private.

Regards,

Carlos.

Share this post


Link to post
Share on other sites

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.

Guest
Reply to this topic...

×   Pasted as rich text.   Paste as plain text instead

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.

Loading...
Sign in to follow this  

×
×
  • Create New...