Running-example consistency: paths, tasks.json, command collisions (#7,#10,#11) (#57)
Co-authored-by: claude <claude@jpaul.io> Co-committed-by: claude <claude@jpaul.io>
This commit was merged in pull request #57.
This commit is contained in:
@@ -9,8 +9,9 @@
|
||||
# read the <<<<<<< / ======= / >>>>>>> markers, edit to the version you want, remove the markers,
|
||||
# then `git add` + `git commit`.
|
||||
#
|
||||
# Run it from anywhere inside your tasks-app repo:
|
||||
# bash modules/06-branches-sandboxes-for-experiments/lab/make-conflict.sh
|
||||
# Copy it into your tasks-app repo, then run it from inside the repo:
|
||||
# cp /path/to/modules/06-branches-sandboxes-for-experiments/lab/make-conflict.sh .
|
||||
# bash make-conflict.sh
|
||||
#
|
||||
# It is non-destructive to your real work: it only touches README.md on two throwaway practice
|
||||
# branches and refuses to run if your working tree is dirty.
|
||||
|
||||
Reference in New Issue
Block a user