Ellié Computing Home Page
My Shopping Cart

Your shopping cart is empty

Display Cart

Call us at +1 586 62 ELLIE / +1 586 62 35543 Office Closed
sales@elliecomputing.com - Contact us


Text Conflict State string

 

 

Description

Specifies a way that a text conflict can be solved. It includes pre-established ways to solve a textual conflict, and other codes telling to use a specific user text.

Values

Value Description
hand-typed Use the text typed by the user
inline-favor-left Merge inside the lines, keeping left side text when there is a conflict
inline-favor-right Merge inside the lines, keeping right side text when there is a conflict
inline-inclusive Use left, right and ancestor portions of text (in 3-way mode), interleaving markers which make clear what is the source side for them
inline-left-then-right Merge inside the lines, keeping left then right sides when there is a conflict
inline-right-then-left Merge inside the lines, keeping right then left sides when there is a conflict
line-ancestor  Keep ancestor's lines only
line-inclusive Use left, right and ancestor lines (in 3-way mode), interleaving markers which make clear what is the source side for them
line-left Keep left lines only
line-left-then-right Takes left lines then right lines
line-right Keep right lines only
line-right-then-left Takes right lines then left lines
none Resolve with empty text
unresolved Not yet resolved