Jump to content

Danny

Members
  • Posts

    18
  • Joined

  • Last visited

  • Days Won

    1

Posts posted by Danny

  1. Thank you, I'm more interested in if there is a log output somewhere that says "xyz was merged with [tool]" or something? 

    If not, would be a nice feature. Since the file is text and the external tool I'm using is for semantic merge of a specific file structure, its not obvious if the tool was used or not sometimes. 

  2. Just hit the same issue. Global lock doesn't seem very useful and has a fundamental flaw of not actually preventing conflicts between branches (until "traveling locks" are implemented). We were also planning on branching one way and never merging back at some point, for porting reasons. "Traveling locks" might make that impossible. I suppose we'll look into pushing the branch to a different repo, but it is always nice to have the option to merge later, in case we didn't plan ahead perfectly. 

    Ideally locking would be branch specific. For our use case, I'd rather have merge conflicts that I manually resolve for binary files than global locking. Locking is nice for our main branch for day to day work, though.

    thanks

  3. thanks, I'd like to start over then, everything I've checked in is for evaluating Plastic SCM at the moment. Who can I contact? 

    I do not have a server folder in [User]\AppData\Local\plastic4

    or anything related to plastic in C:\Users\[User]

    thank you

×
×
  • Create New...