update docs
parent
1cad544476
commit
f62fa11520
@ -0,0 +1,3 @@
|
|||||||
|
|
||||||
|
## Git merging with upstream
|
||||||
|
use the strategy=ours
|
Loading…
Reference in New Issue