Skip to content

Fix 'dummy ours merge strategy' display #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ben merged 1 commit into from
Nov 13, 2014
Merged

Fix 'dummy ours merge strategy' display #170

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions book/08-customizing-git/sections/attributes.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

@ben ben Nov 13, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you also drop the leading space here?

Copy link
Contributor Author

@zigarn zigarn Nov 13, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see any leading space in the source file.

Copy link
Member

@ben ben Nov 13, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Woops, you're right, it's just in the diff.

----

If you merge in the other branch, instead of having merge conflicts with the `database.xml` file, you see something like this:

Expand Down