Jump to content
Plastic SCM forums are now in Unity. Click here to open the new forum ×

scaslin

Members
 View Profile  See their activity

  • Posts

    8

  • Joined

  • Last visited

 Content Type 

Posts posted by scaslin

  1. Merging when using cloaked.conf

    in Branching and merging

    Posted

    We have different merge behaviour when using a cloaked.conf file.

    Normally when submitting changes with no conflicts the merge is automatic and works great.

    When using a cloaked.conf we always get a manual merge dialog even when there isn't any conflicting files, we also end up with a fat branch.

    Why is this happening? what is the fix?

    Thanks,

    Steven

     

×
×
  • Create New...