Skip to content
Unverified Commit 216963e7 authored by Joas Schilling's avatar Joas Schilling
Browse files

Add documentation for the conflict handling 



Signed-off-by: default avatarJoas Schilling <coding@schilljs.com>
parent 394008a1
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment