afed93f58ab5fc8c7cdb649273885aac94c87a02
Add warning before make-update and make-push to alert developers that running the commands might be destructive. Allow cancelling the command up to 3 seconds before continuing. Also explain that merge conflicts warrant a re-run of the command.
Adding the "common" subtree as your .gitlab folder
# Add the subtree as a remote
git subtree add --prefix .gitlab git@gitlab.ducoterra.net:services/common.git main --squash
# Now you can run the following to update
make make-update
Description
Minecraft server for [the-1122-pack](https://www.technicpack.net/modpack/the-1122-pack.1406454/mods)
Languages
Makefile
78.5%
Dockerfile
21.5%