Adding info for Jenkisfile merge

2018-02-18 22:50:08 +01:00 · 2018-02-18 22:50:08 +01:00 · b6d8a07ecb
commit b6d8a07ecb
parent afdd15fa9b
1 changed files with 10 additions and 1 deletions
--- a/README.md
+++ b/README.md
@ -68,5 +68,14 @@ Devel: <br/>[![Build Status](https://jenkins.seb6596.ovh/buildStatus/icon?job=Br
 >     internal:
 >       external: false
 > ```
-> Docker hub [repo](https://hub.docker.com/r/brokenfire/brokendiscordbot/) 
+> Docker hub [repo](https://hub.docker.com/r/brokenfire/brokendiscordbot/)
+
+#### Jenkisfile
+`git config --global merge.ours.driver true`
+
+```
+[merge "ours"]
+    name = "Keep ours merge"
+    driver = true
+```