Jump to content

Nick D

Members
  • Posts

    4
  • Joined

  • Last visited

Posts posted by Nick D

  1. Hello, I'm looking to see if anyone can provide insight into exactly what the "--noninteractiveresolution" option for cm merge does under the hood. My company has used it as part of an automated merge tool after coming across it in this thread, but recently we've been encountering an issue where child branches are getting spun off of destination branches with the same name (i.e: /main/dev/destination/destination-2 is branching off of /main/dev/destination). Given the timing of when the branches are created and when the command is called, I was wondering if there is a link between the two and I'd like to start by getting more information on what "--noninteractiveresolution" does outside of preventing Plastic for asking the user to perform manual conflict resolution.

×
×
  • Create New...