Merge pull request #513 from wasp-lang/franjo/git-ignore-app

This commit is contained in:
Franjo Mindek
2025-09-24 17:05:18 +02:00
committed by GitHub
2 changed files with 3 additions and 3 deletions

View File

@@ -1,3 +1 @@
# We can't ignore `app/` because it messes up our patch/diff procedure (check app/
# the README for more info on this)
# app/

View File

@@ -140,6 +140,8 @@ recreate_derived_dir() {
echo "DONE: generated ${DERIVED_DIR}/" echo "DONE: generated ${DERIVED_DIR}/"
(cd "${DERIVED_DIR}" && git init -b main -q)
if [ ${num_patches_failed} -gt 0 ]; then if [ ${num_patches_failed} -gt 0 ]; then
echo -e "${RED_COLOR}${num_patches_failed} patches failed, look into generated files for merge conflicts.${RESET_COLOR}" echo -e "${RED_COLOR}${num_patches_failed} patches failed, look into generated files for merge conflicts.${RESET_COLOR}"
exit 1 exit 1