File tree Expand file tree Collapse file tree 1 file changed +6
-8
lines changed Expand file tree Collapse file tree 1 file changed +6
-8
lines changed Original file line number Diff line number Diff line change @@ -201,8 +201,6 @@ git add .
201
201
git commit -m " Add f"
202
202
git l -1
203
203
204
- exit
205
-
206
204
echo " ******** STEP heavyeight tag (a commit) :"
207
205
# git tag -a v0.0.1 -m"v1 unsigned"
208
206
git tag -a v0.0.1 -m" v1 signed" -s # signed "heavyweight" tag
425
423
# git config branch.develop.remote origin
426
424
# fi
427
425
428
- exit
429
426
echo " ********** DOTHIS: Manually make a change online GitHub file : "
430
427
echo " Add to bottom of README.md \" Changed online\" and Save."
431
- read " Press Enter/Return to continue:"
428
+ read " WAITING FOR RESPONSE: Press Enter/Return to continue:"
432
429
433
430
echo " ********** Making change that will be duplicated online : "
434
431
echo -e " Change locally\r\n" >> README.md
435
432
436
- echo " ********** Doing git pull to create conflict : "
437
- git pull
438
-
433
+ # echo "********** Doing git pull to create conflict : "
434
+ # git pull
435
+ echo " ********** Doing git fetch a conflict : "
436
+ git fetch
439
437
440
438
441
439
# Commented out for cleanup at start of next run:
442
440
# cd ..
443
441
# rm -rf ${REPONAME}
444
442
445
- echo " ******** $NOW end."
443
+ echo " ******** $NOW end."
You can’t perform that action at this time.
0 commit comments