Skip to content

Edited some typos #2

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

Open
yaeji43 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Edited some typos #2

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
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,19 +323,19 @@ To see all the remotes that you have access to, type 'git remote -v'.
[Back to the tippety-top.](#top)

----------------------------------------------------------------------
#### <a name="conflicts"></a>I git pulled and now I have a konflict. What do I do?
#### <a name="conflicts"></a>I git pulled and now I have a conflict. What do I do?

Fix it. The error messinge tells you which files contain the konflict.
Fix it. The error messinge tells you which files contain the conflict.
Open them in an editor and search for the string
'&gt;&gt;&gt;&gt;&gt;&gt;'. Just like in svn, the portion of code
between this string and the '======' mark is the remote version, while
the portion below it and above the '&lt;&lt;&lt;&lt;&lt;&lt;' string is
your local version. Edit the file so it is correct. Then, to resolve the
konflict in &lt;filename&gt;you 'git add &lt;filename&gt;' before you then `git commit` to save your changes.
conflict in &lt;filename&gt;you 'git add &lt;filename&gt;' before you then `git commit` to save your changes.
You will also want to push your change to the remote branch on, for example, a hosting service
like GitHub.

If you find yourself fixing complicated konflicts often,
If you find yourself fixing complicated conflicts often,
you may want to learn how to use a `mergetool` to compare the differences.
A more involved tutorial can be found
[here](https://gist.github.com/karenyyng/f19ff75c60f18b4b8149)
Expand Down