mirror of
https://github.com/wasp-lang/open-saas.git
synced 2025-11-19 14:56:45 +01:00
Merge pull request #513 from wasp-lang/franjo/git-ignore-app
This commit is contained in:
4
opensaas-sh/.gitignore
vendored
4
opensaas-sh/.gitignore
vendored
@@ -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/
|
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user