Backupppert/oh-my-git
1
0
Fork 0
mirror of https://github.com/git-learning-game/oh-my-git.git synced 2025-05-21 21:01:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Polish branches chapter

Browse source
This commit is contained in:
blinry 2021-01-13 16:26:48 +01:00
parent 80c50bdc81
commit be45b82e41
18 changed files with 231 additions and 191 deletions
levels/merge
merge-abort

9
levels/merge/merge-abort
View file

@ -1,9 +1,10 @@
title = Merging timelines
cards = checkout commit-auto merge
title = Abort a merge
cards = checkout commit-auto merge merge-abort
[description]
Sometimes you want to merge two commits, nut a merge conflict occurs that you currently don't want to resolve.
Sometimes you want to merge two commits, but a merge conflict occurs that you currently don't want to resolve.
In these situations you can abort the merge to merge later. Use
git merge --abort
when you are in a merge process.
@ -46,7 +47,7 @@ fi
test -f .git/secretfile
# You aborted to merge?
test -f .git/secretfile && ! test -f .git/MERGE_HEAD
test -f .git/secretfile && ! test -f .git/MERGE_HEAD && ! git rev-parse HEAD^^
[congrats]