shen/scratch-blocks
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-blocks.git synced 2024-11-25 16:33:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Rachel Fenichel 2018-05-03 10:21:07 -07:00
parent f13b15880a
commit 9a1dfe4acb
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pull_from_blockly.sh
View File

@ -87,6 +87,8 @@ run_cleanup_fn() {
exit
fi
bold_echo "Running cleanup.sh"
sleep .5
# Cleanup.sh resolves common conflicts.
./cleanup.sh
}
@ -99,13 +101,11 @@ prompt_for_merge_abort() {
prompt "Do you want to abort this merge?" false
if [ $prompt_result = false ]
then
bold_echo "Skipping merge abort."
bold_echo "Continuing with merge..."
else
bold_echo "Running git merge --abort"
git merge --abort
bold_echo "Current status"
sleep .5
git status
display_status_fn
bold_echo "Done"
exit
fi
@ -131,6 +131,7 @@ display_status_fn() {
# next steps should be.
finish_fn() {
prompt_for_merge_abort
bold_echo "Done. You may need to manually resolve conflicts."
# Helpful tips about what to do next.
empty_lines
sleep .5