Settings and activity

1 result found

1. Improve XLink conflict resolving in merge

   •  

   38 votes

   Vote Vote Vote

   Vote

   We're glad you're here

   Please sign in to leave feedback

   Signed in as (Sign out)

   Close

   Close

   1 vote 2 votes 3 votes Remove votes

   You have left! (?) (thinking…)
   5 comments  ·  General  ·  Delete…  ·  Admin →
   How important is this to you?

   Not at all You must login first! Important You must login first! Critical You must login first!

   We're glad you're here

   Please sign in to leave feedback

   Signed in as (Sign out)

   Close

   Close
   under review  ·  AdminCodice Software (CEO / Founder, plasticscm) responded

   Hi supporters!

   We would need an answer to the question we asked here to be able to move forward. Otherwise, without extra info, we would need to discard.

   Thanks,

   pablo

   An error occurred while saving the comment
   Maurizio Margiotta commented  ·  Oct 25, 2018  ·  Edit…  ·  Delete…

   The changeset id and name are for sure welcome, but I would also add that I got a conflict showing the exact same GUIDs as both branches that were merging had an xlink updated to the same changeset. So under the subject of "improving xlink conflic resolving", I'd say that this situation could also be automated.

   Save Submitting...