Skip to content

Commit 045015f

Browse files
authored
Update README.md
Added a link to the description to abort the merge
1 parent 5fc6b22 commit 045015f

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -854,6 +854,7 @@ Sometimes you have several work in progress commits that you want to combine bef
854854

855855
This will do an interactive rebase that lists only the commits that you haven't already pushed, so it will be safe to reorder/fix/squash anything in the list.
856856

857+
<a name="i-need-to-abort-the-merge"></a>
857858
#### I need to abort the merge
858859

859860
Sometimes the merge can produce problems in certain files, in those cases we can use the option `abort` to abort the current conflict resolution process, and try to reconstruct the pre-merge state.

0 commit comments

Comments
 (0)