sebclem/ClaptrapBot
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 1 Wiki Activity

Adding info for Jenkisfile merge

Browse Source
This commit is contained in:
BrokenFire 2018-02-18 22:50:08 +01:00
parent afdd15fa9b
commit b6d8a07ecb
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
README.md
View File

@ -68,5 +68,14 @@ Devel: <br/>[![Build Status](https://jenkins.seb6596.ovh/buildStatus/icon?job=Br
> internal: > internal:
> external: false > 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
```