alvaro/git-flight-rules
1
0
Fork 0
mirror of https://github.com/k88hudson/git-flight-rules.git synced 2025-03-10 12:48:43 -03:00
Code Issues Releases Wiki Activity

Update README.md

Browse Source 
Added a link to the description to abort the merge
This commit is contained in:
JUAN CALVOPINA M 2017-11-28 10:52:16 -03:00 committed by GitHub
parent 5fc6b2289d
commit 045015f66d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -854,6 +854,7 @@ Sometimes you have several work in progress commits that you want to combine bef
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.
<a name="i-need-to-abort-the-merge"></a>
#### I need to abort the merge
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.