homepage › Forums › BridgePoint/xtUML Usage and Training › Using Git › Reply To: Using Git
February 17, 2017 at 3:41 pm
#5755
micke.x
Member
Thanks.
Well, I did now,
but I think the conflict examples were somewhat ideal/trivial.
Problematic conflicts, that I am trying to find WoW for include :
– structural non-leaf conflicts, e.g. in each branch a class is added to the same package
– conflicts in action code
– type name change, with propagation to all references (in several files)