Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Don't render markdown in conflict example #9

Merged
merged 1 commit into from

2 participants

@jenshnielsen
Owner

No description provided.

@jamespjh jamespjh merged commit 8c2439d into master
@kynan kynan deleted the git3 branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Apr 3, 2013
  1. @jenshnielsen

    no markdown

    jenshnielsen authored
This page is out of date. Refresh to see the latest.
Showing with 5 additions and 5 deletions.
  1. +5 −5 git/git_instructions.md
View
10 git/git_instructions.md
@@ -472,11 +472,11 @@ Whoever pushed second, and is now trying to pull, now has to manually resolve th
Edit the file. It should look something like this:
-> <<<<<<< HEAD
-> Wales is hillier than England, but not quite as hilly as Scotland.
-> =======
-> Wales is much hillier than England, but not as hilly as Scotland.
-> >>>>>>> dba9bbf3bcab1008b4d59342392cc70890aaf8e6
+> <<<<<<< HEAD
+> Wales is hillier than England, but not quite as hilly as Scotland.
+> =======
+> Wales is much hillier than England, but not as hilly as Scotland.
+> >>>>>>> dba9bbf3bcab1008b4d59342392cc70890aaf8e6
The syntax with `<<<` `===` and `>>>` shows the differences between the files. You can get editors which can understand this syntax and make it easy to merge, but for now, just manually edit the file, to combine the changes and get rid of the symbols.
Something went wrong with that request. Please try again.