Permalink
Browse files
automerge Gemfile.lock strategy
- Loading branch information...
Showing
with
3 additions
and 0 deletions.
-
+3
−0
gitconfig
|
|
@@ -34,3 +34,6 @@ |
|
|
autosetupmerge = true
|
|
|
[apply]
|
|
|
whitespace = nowarn
|
|
|
+[merge "gemfilelock"]
|
|
|
+ name = relocks the gemfile.lock
|
|
|
+ driver = bundle lock
|
0 comments on commit
4ed4930