a non-versioned [...] node is a virtual

modifyable settings for a

configuration of a trace

resulted in a conflict.

multiple diagrams, and a

of a variable in

, for y-axes: a range

versions of a file and

that a Diff can

create a merge commit