Skip to content
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

Fix typo #44

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

Fix typo #44

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
2 changes: 1 addition & 1 deletion doc/git-conflict.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,7 @@ <h2 id="_internals">INTERNALS</h2>
<div class="sect1">
<h2 id="_limitations">LIMITATIONS</h2>
<div class="sectionbody">
<div class="paragraph"><p>Currently, when reapplying a resolution, it will only look at <code>both modified</code> files. So conflicts with renames, mod changes and deletions are not handled. In addition, If you changed something in a file that wasn&#8217;t in conflict state, it won&#8217;t be reapply neither.</p></div>
<div class="paragraph"><p>Currently, when reapplying a resolution, it will only look at <code>both modified</code> files. So conflicts with renames, mod changes and deletions are not handled. In addition, If you changed something in a file that wasn&#8217;t in conflict state, it won&#8217;t be reapplied neither.</p></div>
<div class="paragraph"><p>Managing conflicts with more than a single branch is subtle. Let&#8217;s say I&#8217;m on a local branch <code>topic_mine</code> and I have two different conflicts with <code>topic_arya</code> and <code>topic_eddard</code></p></div>
<div class="listingblock">
<div class="content">
Expand Down