Skip to content

Rules of fixing the conflicts in ScadaLTS.

Jump to bottom
Grzegorz Bylica edited this page Apr 20, 2017 · 1 revision
  1. The conflicts solves the developer who merges to develop branch.
  2. How to solve conflicts Resolving a merge conflict using the command line
Clone this wiki locally