mirror of
https://github.com/bonfire-networks/bonfire-app.git
synced 2024-05-18 00:52:40 +00:00
misc
This commit is contained in:
parent
0bf2cfada9
commit
c9786eb716
|
@ -30,7 +30,7 @@ then
|
|||
fi
|
||||
|
||||
# merge/rebase local changes
|
||||
git rebase && echo "Publishing changes!" && git push || fail "Please resolve conflicts before continuing."
|
||||
git rebase origin && echo "Publishing changes!" && git push || fail "Please resolve conflicts before continuing."
|
||||
|
||||
else
|
||||
set -e
|
||||
|
|
4
mix.lock
4
mix.lock
|
@ -12,7 +12,7 @@
|
|||
"bonfire_boundaries": {:git, "https://github.com/bonfire-networks/bonfire_boundaries", "4cf02375ba38cdf16f465bc8b7a969f3c677077f", [branch: "feature/dogfood"]},
|
||||
"bonfire_breadpub": {:git, "https://github.com/bonfire-networks/bonfire_breadpub", "39854b5e01f9592d6083da12513b002c9590cccc", [branch: "main"]},
|
||||
"bonfire_classify": {:git, "https://github.com/bonfire-networks/bonfire_classify", "419408d0682330789783a70c156da8e0ba46a693", [branch: "main"]},
|
||||
"bonfire_common": {:git, "https://github.com/bonfire-networks/bonfire_common", "445225477f3e5866ef640b0fa1e09b5fd9b75094", [branch: "main"]},
|
||||
"bonfire_common": {:git, "https://github.com/bonfire-networks/bonfire_common", "bc9932d1a6d1bad2307ae820ba5fdab742820646", [branch: "main"]},
|
||||
"bonfire_data_access_control": {:git, "https://github.com/bonfire-networks/bonfire_data_access_control", "789d04bf915b2d60df9e0d4568a71d63c39db401", [branch: "feature/circles"]},
|
||||
"bonfire_data_activity_pub": {:git, "https://github.com/bonfire-networks/bonfire_data_activity_pub", "5522116c8e5b1a6264fe87139c0a0345aa715cd9", [branch: "main"]},
|
||||
"bonfire_data_assort": {:git, "https://github.com/bonfire-networks/bonfire_data_assort", "6557b7edccf93804ce63a0c5b8cc2ca248434a4f", []},
|
||||
|
@ -29,7 +29,7 @@
|
|||
"bonfire_me": {:git, "https://github.com/bonfire-networks/bonfire_me", "b7309727afc74bfde210a1374752d18dbc3e333e", [branch: "feature/dogfood"]},
|
||||
"bonfire_quantify": {:git, "https://github.com/bonfire-networks/bonfire_quantify", "eeb837c308aef68aa01987cb6aa12889e8772a3b", [branch: "main"]},
|
||||
"bonfire_search": {:git, "https://github.com/bonfire-networks/bonfire_search", "1fdceaf1ee3b58bec16c5d1446ac6a237c00fe8e", [branch: "main"]},
|
||||
"bonfire_social": {:git, "https://github.com/bonfire-networks/bonfire_social", "73cb4add08bf3a0d9b69d010c70791f378ba061c", [branch: "feature/dogfood"]},
|
||||
"bonfire_social": {:git, "https://github.com/bonfire-networks/bonfire_social", "23d435136cf77fd2d654abc0de262a398df83d62", [branch: "feature/dogfood"]},
|
||||
"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"]},
|
||||
|
|
Loading…
Reference in a new issue