diff --git a/book/08-customizing-git/sections/attributes.asc b/book/08-customizing-git/sections/attributes.asc index 7bab96231..ec7fdd641 100644 --- a/book/08-customizing-git/sections/attributes.asc +++ b/book/08-customizing-git/sections/attributes.asc @@ -314,12 +314,12 @@ You can set up an attribute like this: database.xml merge=ours ---- -[source,console] ----- And then define a dummy `ours` merge strategy with: ----- +[source,console] +---- $ git config --global merge.ours.driver true +---- If you merge in the other branch, instead of having merge conflicts with the `database.xml` file, you see something like this: