This commit is contained in:
Mayel de Borniol 2022-01-06 10:12:28 +13:00
parent b68466402e
commit 4f3205ef7a
2 changed files with 2 additions and 2 deletions

View file

@ -44,6 +44,6 @@ else
if [[ $2 == 'maybe-pull' ]]
then
# if jungle is available and we assume fetches were already done
jungle || git pull --rebase || fail "Please resolve conflicts before continuing."
command -v jungle || git pull --rebase || fail "Please resolve conflicts before continuing."
fi
fi

View file

@ -33,7 +33,7 @@
"bonfire_tag": {:git, "https://github.com/bonfire-networks/bonfire_tag", "d0868c8a064e30910b2d2846208dfe69f74c227a", [branch: "main"]},
"bonfire_ui_coordination": {:git, "https://github.com/bonfire-networks/bonfire_ui_coordination", "97c02c9f971188a8ff5d5f3b30fc1f8ca7cdc875", [branch: "main"]},
"bonfire_ui_kanban": {:git, "https://github.com/bonfire-networks/bonfire_ui_kanban", "58cee2d3951a01e46efab91a18d1bf73b82a4d5d", [branch: "main"]},
"bonfire_ui_social": {:git, "https://github.com/bonfire-networks/bonfire_ui_social", "0f5bf83c4ddcf0a8c982fbb8a3eed3aa7faa8cfd", [branch: "main"]},
"bonfire_ui_social": {:git, "https://github.com/bonfire-networks/bonfire_ui_social", "dadbfca3b28c610ceceff2059ddef634faf3dca0", [branch: "main"]},
"bonfire_ui_valueflows": {:git, "https://github.com/bonfire-networks/bonfire_ui_valueflows", "1c7e102e188f12c621f8d3b78d7128229a8db7ce", [branch: "main"]},
"bonfire_valueflows": {:git, "https://github.com/bonfire-networks/bonfire_valueflows", "8bf8ecce46b31d3136b237771b3b97134207fd71", [branch: "main"]},
"bonfire_valueflows_observe": {:git, "https://github.com/bonfire-networks/bonfire_valueflows_observe", "238c090f7da27e2aa917f5f47de8b3a3ddfde7ae", []},