DGNum/gestioCOF
12
2
Fork 2
Code Issues 84 Pull requests 17 Projects Releases 12 Packages Wiki Activity Actions

WIP: Aureplop/restructuring #608

Draft
delobell wants to merge 3 commits from aureplop/restructuring into master
pull from: aureplop/restructuring
merge into: DGNum:master
Conversation 9 Commits 3 Files changed 194 +495 -341
delobell commented 2018-06-17 19:53:55 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

A voir avec le setup de prod (en particulier les services).

Utilisation

# (Production)
$ git pull
# (Autres)
$ git merge --no-ff aureplop/restructuring (depuis master par exemple)

# (en supposant que les services soient dans /etc/systemd/system/,
# sinon tweak SERVICE_DAPHNE et SERVICE_WORKER dans provisioning/move_apps_helpers.sh)
$ (sudo) DJANGO_SETTINGS_MODULE="gestioCOF.settings.<env>" SERVICE_DAPHNE_FILENAME="daphne.service" SERVICE_WORKER_FILENAME="worker.service" sh provisioning/move_apps.sh

Pour tester

$ git checkout aureplop/restructuring
$ vagrant up && vagrant ssh
$ sudo bash provisioning/test_move_apps.sh (ciao la DB de Vagrant)

Pour en savoir plus, checker les nouveaux provisioning/%move_apps%.sh.

Todos

  • Rebase master /!\

Remarques

Déploiement

  • Vues SQL des mailing list : MAJ les noms de table gestioncof_... → cof_...
A voir avec le setup de prod (en particulier les services). ## Utilisation ``` # (Production) $ git pull # (Autres) $ git merge --no-ff aureplop/restructuring (depuis master par exemple) # (en supposant que les services soient dans /etc/systemd/system/, # sinon tweak SERVICE_DAPHNE et SERVICE_WORKER dans provisioning/move_apps_helpers.sh) $ (sudo) DJANGO_SETTINGS_MODULE="gestioCOF.settings.<env>" SERVICE_DAPHNE_FILENAME="daphne.service" SERVICE_WORKER_FILENAME="worker.service" sh provisioning/move_apps.sh ``` ## Pour tester ``` $ git checkout aureplop/restructuring $ vagrant up && vagrant ssh $ sudo bash provisioning/test_move_apps.sh (ciao la DB de Vagrant) ``` Pour en savoir plus, checker les nouveaux ``provisioning/%move_apps%.sh``. ## Todos - [ ] Rebase master /!\ ## Remarques ### Déploiement - [ ] Vues SQL des mailing list : MAJ les noms de table `gestioncof_...` → `cof_...`
delobell commented 2018-06-17 19:54:30 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

changed the description

changed the description
delobell commented 2018-06-30 17:48:47 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 1 commit

  • 8cd73c3f - Add script for migrations

Compare with previous version

added 1 commit * 8cd73c3f - Add script for migrations [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/304/diffs?diff_id=879&start_sha=b1ba521813ee51f866c7c1bea5536904a7cb5060)
delobell commented 2018-06-30 18:24:36 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 1 commit

  • ddd6664f - Add script for migrations

Compare with previous version

added 1 commit * ddd6664f - Add script for migrations [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/304/diffs?diff_id=880&start_sha=8cd73c3fcf94dc869a48d7979c107aebd10c9779)
delobell commented 2018-09-29 16:35:37 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

changed the description

changed the description
delobell commented 2018-09-29 22:06:32 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 15 commits

  • ddd6664f...f297a1a0 - 12 commits from branch master
  • d2cd9df3 - /cof/ → /gestioCOF/ && /gestioncof/ → /cof/
  • 381b660d - Add script for migrations
  • 30061d3e - Update CI config for new tree

Compare with previous version

added 15 commits * ddd6664f...f297a1a0 - 12 commits from branch `master` * d2cd9df3 - &#x2F;cof&#x2F; → &#x2F;gestioCOF&#x2F; &amp;&amp; &#x2F;gestioncof&#x2F; → &#x2F;cof&#x2F; * 381b660d - Add script for migrations * 30061d3e - Update CI config for new tree [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/304/diffs?diff_id=919&start_sha=ddd6664fa0174afc600f4ffc7be44d40ef28e361)
delobell commented 2018-09-29 22:14:41 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 3 commits

  • c297c7b5 - /cof/ → /gestioCOF/ && /gestioncof/ → /cof/
  • bb2868a5 - Add script for migrations
  • 86fc8778 - Update CI config for new tree

Compare with previous version

added 3 commits * c297c7b5 - &#x2F;cof&#x2F; → &#x2F;gestioCOF&#x2F; &amp;&amp; &#x2F;gestioncof&#x2F; → &#x2F;cof&#x2F; * bb2868a5 - Add script for migrations * 86fc8778 - Update CI config for new tree [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/304/diffs?diff_id=920&start_sha=30061d3e18e419c57098174455641a47653139bb)
delobell commented 2018-09-30 14:44:17 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added ~62 ~30 ~28 labels

added ~62 ~30 ~28 labels
mpepin commented 2018-10-04 19:01:35 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

penser aux vues sql

penser aux vues sql
delobell commented 2018-10-06 17:53:30 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

changed the description

changed the description
This pull request has changes conflicting with the target branch.
  • .gitlab-ci.yml
  • bda/management/commands/loadbdadevdata.py
  • bda/tests/test_models.py
  • bda/urls.py
  • bda/views.py
  • cof/__init__.py
  • cof/migrations/0015_psql_choices_niveaux.py
  • cof/migrations/0016_unique_clippers.py
  • cof/migrations/0017_petitscours_uniqueness.py
  • cof/migrations/0018_petitscours_email.py
  • cof/migrations/0019_auto_20220630_1241.py
  • cof/migrations/0019_cofprofile_date_adhesion.py
  • cof/migrations/0020_merge_20241218_2240.py
  • cof/migrations/0021_cofprofile_is_kfet_alter_cofprofile_is_cof.py
  • cof/migrations/0021_delete_club.py
  • cof/migrations/0022_rename_cofprofile_date_adhesion_and_more.py
  • cof/migrations/0023_cofprofile_is_chef.py
  • cof/migrations/0024_cofprofile_semestrial_cof.py
  • cof/migrations/0024_merge_0021_delete_club_0023_cofprofile_is_chef.py
  • cof/migrations/0025_merge_20250919_1443.py
  • cof/migrations/0026_alter_petitcoursability_niveau_and_more.py
  • cof/settings/.gitignore
  • cof/settings/secret_example.py
  • cof/templates/buro-denied.html
  • cof/templates/cof/carte_kf.html
  • cof/templates/cof/home.html
  • cof/templates/cof/mails/email_check.txt
  • cof/templates/cof/mails/reset.txt
  • cof/templates/cof/mails/welcome.txt
  • cof/templates/cof/registration_kf_form.html
  • cof/templates/cof/registration_kf_post.html
  • cof/templates/cof/reset_comptes.html
  • cof/templates/cof/search_results.html
  • cof/templates/cof/self_registration.html
  • cof/templates/kfet-denied.html
  • cof/templates/login_error.html
  • cof/templates/logout.html
  • cof/templates/registration/password_reset_confirm.html
  • cof/templates/registration/password_reset_done.html
  • cof/templates/registration/password_reset_email.html
  • cof/templates/registration/password_reset_form.html
  • cof/tests/mixins.py
  • cof/urls.py
  • gestioCOF/asgi.py
  • gestioCOF/locale/fr/formats.py
  • gestioCOF/routing.py
  • gestioCOF/settings/.gitignore
  • gestioCOF/settings/common.py
  • gestioCOF/settings/dev.py
  • gestioCOF/settings/local.py
  • gestioCOF/settings/prod.py
  • gestioCOF/settings/secret_example.py
  • gestioasso/admin.py
  • gestioasso/apps.py
  • gestioasso/autocomplete.py
  • gestioasso/csv_views.py
  • gestioasso/decorators.py
  • gestioasso/fixtures/gestion.json
  • gestioasso/fixtures/sites.json
  • gestioasso/forms.py
  • gestioasso/management/__init__.py
  • gestioasso/management/base.py
  • gestioasso/management/commands/__init__.py
  • gestioasso/management/commands/loaddevdata.py
  • gestioasso/management/commands/syncmails.py
  • gestioasso/management/data/custommail.json
  • gestioasso/management/data/gaulois.json
  • gestioasso/management/data/romains.json
  • gestioasso/migrations/0001_initial.py
  • gestioasso/migrations/0002_enable_unprocessed_demandes.py
  • gestioasso/migrations/0003_event_image.py
  • gestioasso/migrations/0004_registration_mail.py
  • gestioasso/migrations/0005_encoding.py
  • gestioasso/migrations/0006_add_calendar.py
  • gestioasso/migrations/0007_alter_club.py
  • gestioasso/migrations/0008_py3.py
  • gestioasso/migrations/0009_delete_clipper.py
  • gestioasso/migrations/0010_delete_custommail.py
  • gestioasso/migrations/0011_longer_clippers.py
  • gestioasso/migrations/0011_remove_cofprofile_num.py
  • gestioasso/migrations/0012_merge.py
  • gestioasso/migrations/0013_pei.py
  • gestioasso/migrations/0014_cofprofile_mailing_unernestaparis.py
  • gestioasso/migrations/__init__.py
  • gestioasso/models.py
  • gestioasso/petits_cours_forms.py
  • gestioasso/petits_cours_models.py
  • gestioasso/petits_cours_views.py
  • gestioasso/settings/.gitignore
  • gestioasso/settings/secret.py
  • gestioasso/settings/secret_example.py
  • gestioasso/shared.py
  • gestioasso/signals.py
  • gestioasso/static/css/bootstrap.min.css
  • gestioasso/static/css/bootstrap.min.css.map
  • gestioasso/static/css/cof.css
  • gestioasso/static/css/droidserif.woff
  • gestioasso/static/css/jquery-ui.min.css
  • gestioasso/static/font-awesome/HELP-US-OUT.txt
  • gestioasso/static/font-awesome/css/font-awesome.css
  • gestioasso/static/font-awesome/css/font-awesome.min.css
  • gestioasso/static/font-awesome/fonts/FontAwesome.otf
  • gestioasso/static/font-awesome/fonts/fontawesome-webfont.eot
  • gestioasso/static/font-awesome/fonts/fontawesome-webfont.svg
  • gestioasso/static/font-awesome/fonts/fontawesome-webfont.ttf
  • gestioasso/static/font-awesome/fonts/fontawesome-webfont.woff
  • gestioasso/static/font-awesome/fonts/fontawesome-webfont.woff2
  • gestioasso/static/font-awesome/less/animated.less
  • gestioasso/static/font-awesome/less/bordered-pulled.less
  • gestioasso/static/font-awesome/less/core.less
  • gestioasso/static/font-awesome/less/fixed-width.less
  • gestioasso/static/font-awesome/less/font-awesome.less
  • gestioasso/static/font-awesome/less/icons.less
  • gestioasso/static/font-awesome/less/larger.less
  • gestioasso/static/font-awesome/less/list.less
  • gestioasso/static/font-awesome/less/mixins.less
  • gestioasso/static/font-awesome/less/path.less
  • gestioasso/static/font-awesome/less/rotated-flipped.less
  • gestioasso/static/font-awesome/less/screen-reader.less
  • gestioasso/static/font-awesome/less/stacked.less
  • gestioasso/static/font-awesome/less/variables.less
  • gestioasso/static/font-awesome/scss/_animated.scss
  • gestioasso/static/font-awesome/scss/_bordered-pulled.scss
  • gestioasso/static/font-awesome/scss/_core.scss
  • gestioasso/static/font-awesome/scss/_fixed-width.scss
  • gestioasso/static/font-awesome/scss/_icons.scss
  • gestioasso/static/font-awesome/scss/_larger.scss
  • gestioasso/static/font-awesome/scss/_list.scss
  • gestioasso/static/font-awesome/scss/_mixins.scss
  • gestioasso/static/font-awesome/scss/_path.scss
  • gestioasso/static/font-awesome/scss/_rotated-flipped.scss
  • gestioasso/static/font-awesome/scss/_screen-reader.scss
  • gestioasso/static/font-awesome/scss/_stacked.scss
  • gestioasso/static/font-awesome/scss/_variables.scss
  • gestioasso/static/font-awesome/scss/font-awesome.scss
  • gestioasso/static/fonts/glyphicons-halflings-regular.eot
  • gestioasso/static/fonts/glyphicons-halflings-regular.svg
  • gestioasso/static/fonts/glyphicons-halflings-regular.ttf
  • gestioasso/static/fonts/glyphicons-halflings-regular.woff
  • gestioasso/static/fonts/glyphicons-halflings-regular.woff2
  • gestioasso/static/images/no.png
  • gestioasso/static/images/none.png
  • gestioasso/static/images/yes.png
  • gestioasso/static/js/bootstrap.min.js
  • gestioasso/static/js/joequery-Stupid-Table-Plugin/LICENSE
  • gestioasso/static/js/joequery-Stupid-Table-Plugin/README.md
  • gestioasso/static/js/joequery-Stupid-Table-Plugin/examples/basic.html
  • gestioasso/static/js/joequery-Stupid-Table-Plugin/examples/colspan.html
  • gestioasso/static/js/joequery-Stupid-Table-Plugin/examples/complex.html
  • gestioasso/static/js/joequery-Stupid-Table-Plugin/examples/large-table.html
  • gestioasso/static/js/joequery-Stupid-Table-Plugin/stupidtable.js
  • gestioasso/static/js/joequery-Stupid-Table-Plugin/stupidtable.min.js
  • gestioasso/static/js/jquery-ui.min.js
  • gestioasso/static/js/jquery.min.js
  • gestioasso/static/js/jquery.ui.touch-punch.min.js
  • gestioasso/templates/404.html
  • gestioasso/templates/500.html
  • gestioasso/templates/autocomplete_user.html
  • gestioasso/templates/base.html
  • gestioasso/templates/base_title.html
  • gestioasso/templates/base_title_petitscours.html
  • gestioasso/templates/cof-denied.html
  • gestioasso/templates/cof/banner_update.html
  • gestioasso/templates/cof/base_header.html
  • gestioasso/templates/cof/calendar_subscription.html
  • gestioasso/templates/cof/details_demande_petit_cours.html
  • gestioasso/templates/cof/event.html
  • gestioasso/templates/cof/profile.html
  • gestioasso/templates/cof/registration_form.html
  • gestioasso/templates/cof/registration_post.html
  • gestioasso/templates/cof/survey.html
  • gestioasso/templates/cof/traitement_demande_petit_cours.html
  • gestioasso/templates/cof/traitement_demande_petit_cours_autre_niveau.html
  • gestioasso/templates/cof/traitement_demande_petit_cours_success.html
  • gestioasso/templates/cof/utile_cof.html
  • gestioasso/templates/demande-petit-cours-raw.html
  • gestioasso/templates/demande-petit-cours.html
  • gestioasso/templates/details_demande_petit_cours_infos.html
  • gestioasso/templates/error.html
  • gestioasso/templates/event_status.html
  • gestioasso/templates/home.html
  • gestioasso/templates/inscription-petit-cours-formset.html
  • gestioasso/templates/inscription-petit-cours.html
  • gestioasso/templates/liste_clubs.html
  • gestioasso/templates/liste_mails.html
  • gestioasso/templates/login.html
  • gestioasso/templates/login_switch.html
  • gestioasso/templates/membres_clubs.html
  • gestioasso/templates/petits_cours_demandes_list.html
  • gestioasso/templates/registration.html
  • gestioasso/templates/registration/password_change_done.html
  • gestioasso/templates/registration/password_change_form.html
  • gestioasso/templates/survey_status.html
  • gestioasso/templates/tristate_js.html
  • gestioasso/templates/utile_bda.html
  • gestioasso/templatetags/__init__.py
  • gestioasso/templatetags/utils.py
  • gestioasso/tests/__init__.py
  • gestioasso/tests/test_legacy.py
  • gestioasso/tests/test_views.py
  • gestioasso/tests/testcases.py
  • gestioasso/tests/utils.py
  • gestioasso/views.py
  • gestioasso/widgets.py
  • gestioncof/__init__.py
  • gestioncof/static/css/cof.css
  • gestioncof/static/font-awesome/css/font-awesome.css
  • gestioncof/static/font-awesome/css/font-awesome.min.css
  • gestioncof/static/font-awesome/fonts/FontAwesome.otf
  • gestioncof/static/font-awesome/fonts/fontawesome-webfont.eot
  • gestioncof/static/font-awesome/fonts/fontawesome-webfont.svg
  • gestioncof/static/font-awesome/fonts/fontawesome-webfont.ttf
  • gestioncof/static/font-awesome/fonts/fontawesome-webfont.woff
  • gestioncof/static/font-awesome/fonts/fontawesome-webfont.woff2
  • gestioncof/static/fonts/glyphicons-halflings-regular.eot
  • gestioncof/static/fonts/glyphicons-halflings-regular.svg
  • gestioncof/static/fonts/glyphicons-halflings-regular.ttf
  • gestioncof/static/fonts/glyphicons-halflings-regular.woff
  • gestioncof/static/fonts/glyphicons-halflings-regular.woff2
  • gestioncof/static/gestioncof/css/cof.css
  • gestioncof/static/gestioncof/src/stupidtable.js
  • gestioncof/static/gestioncof/vendor/jquery.ui.touch-punch.min.js
  • gestioncof/static/gestioncof/vendor/stupidtable.min.js
  • gestioncof/static/images/no.png
  • gestioncof/static/images/none.png
  • gestioncof/static/images/yes.png
  • gestioncof/static/js/joequery-Stupid-Table-Plugin/LICENSE
  • gestioncof/static/js/joequery-Stupid-Table-Plugin/stupidtable.js
  • gestioncof/static/js/joequery-Stupid-Table-Plugin/stupidtable.min.js
  • gestioncof/static/js/jquery.ui.touch-punch.min.js
  • gestioncof/templates/base_title_petitscours.html
  • gestioncof/templates/demande-petit-cours-raw.html
  • gestioncof/templates/demande-petit-cours.html
  • gestioncof/templates/details_demande_petit_cours_infos.html
  • gestioncof/templates/error.html
  • gestioncof/templates/gestioncof/traitement_demande_petit_cours.html
  • gestioncof/templates/gestioncof/traitement_demande_petit_cours_autre_niveau.html
  • gestioncof/templates/gestioncof/traitement_demande_petit_cours_success.html
  • gestioncof/templates/home.html
  • gestioncof/templates/inscription-petit-cours-formset.html
  • gestioncof/templates/inscription-petit-cours.html
  • gestioncof/templates/petits_cours_demandes_list.html
  • gestioncof/urls.py
  • kfet/auth/tests.py
  • kfet/autocomplete.py
  • kfet/forms.py
  • kfet/management/commands/loadkfetdevdata.py
  • kfet/migrations/0001_initial.py
  • kfet/migrations/0059_create_generic.py
  • kfet/models.py
  • kfet/open/tests.py
  • kfet/tests/test_config.py
  • kfet/tests/test_statistic.py
  • kfet/tests/test_tests_utils.py
  • kfet/tests/testcases.py
  • kfet/views.py
  • manage.py
  • petitscours/templates/petitscours/base_title.html
  • petitscours/templates/petitscours/demande.html
  • petitscours/templates/petitscours/demande_list.html
  • petitscours/templates/petitscours/demande_raw.html
  • petitscours/templates/petitscours/details_demande_infos.html
  • petitscours/templates/petitscours/inscription.html
  • petitscours/templates/petitscours/inscription_formset.html
  • petitscours/templates/petitscours/traitement_demande.html
  • petitscours/templates/petitscours/traitement_demande_autre_niveau.html
  • petitscours/templates/petitscours/traitement_demande_success.html
  • provisioning/bootstrap.sh
  • provisioning/daphne.service
  • provisioning/worker.service
  • shared/static/src/bootstrap/fonts/glyphicons-halflings-regular.eot
  • shared/static/src/bootstrap/fonts/glyphicons-halflings-regular.svg
  • shared/static/src/bootstrap/fonts/glyphicons-halflings-regular.ttf
  • shared/static/src/bootstrap/fonts/glyphicons-halflings-regular.woff
  • shared/static/src/bootstrap/fonts/glyphicons-halflings-regular.woff2
  • shared/static/src/font-awesome/css/font-awesome.css
  • shared/static/src/font-awesome/fonts/FontAwesome.otf
  • shared/static/src/font-awesome/fonts/fontawesome-webfont.eot
  • shared/static/src/font-awesome/fonts/fontawesome-webfont.svg
  • shared/static/src/font-awesome/fonts/fontawesome-webfont.ttf
  • shared/static/src/font-awesome/fonts/fontawesome-webfont.woff
  • shared/static/src/font-awesome/fonts/fontawesome-webfont.woff2
  • shared/static/src/font-awesome/images/no.png
  • shared/static/src/font-awesome/images/none.png
  • shared/static/src/font-awesome/images/yes.png
  • shared/static/vendor/bulma/LICENSE
  • shared/static/vendor/font-awesome/css/font-awesome.min.css
  • shared/tests/testcases.py
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin aureplop/restructuring:aureplop/restructuring
git switch aureplop/restructuring
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
devtype -- backend

Au programme : du Python, du Django...

  
devtype -- docs

   
devtype -- frontend

   
devtype -- user interface

Au programme : templating, JS, CSS...

  
difficulty -- easy

   
difficulty -- hard

Difficile et/ou risqué

  
difficulty -- normal

   
Doing

   
domain -- bda

Concerne l'application BdA

  
domain -- bds

   
domain -- cof

Concerne l'application COF

  
domain -- core

Dépendances externes, CI, linting...

  
domain -- kfet

Concerne l'application K-Fêt

  
Good first issue

   
priority -- high

Urgent quoi

  
priority -- low

   
priority -- medium

   
priority -- staff-wanted

L'équipe dirigeante du domaine en question souhaite cette fonctionnalité.

  
status -- development

En cours de développement

  
status -- discussion

Avant de coder, c'est bien de discuter

  
status -- need review

En attente de code review

  
status -- production

L'ajout/la modification est présente en production

  
status -- ready to merge

Plus qu'à merger !

  
status -- todo

Le développement devrait bientôt commencer

  
To Do

   
type -- bug

Signalement ou correction de bug

  
type -- hygiene

Tout ce qui amène à du code plus propre et un repo mieux organisé.

  
type -- improvement

Ajout/Demande d'évolution mineure d'une fonctionnalité existante

  
type -- new feature

Ajout/Demande d'une nouvelle fonctionnalité

  
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
wontfix

This won't be fixed

No labels
devtype -- backend
devtype -- docs
devtype -- frontend
devtype -- user interface
difficulty -- easy
difficulty -- hard
difficulty -- normal
Doing
domain -- bda
domain -- bds
domain -- cof
domain -- core
domain -- kfet
Good first issue
priority -- high
priority -- low
priority -- medium
priority -- staff-wanted
status -- development
status -- discussion
status -- need review
status -- production
status -- ready to merge
status -- todo
To Do
type -- bug
type -- hygiene
type -- improvement
type -- new feature
bug
duplicate
enhancement
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: DGNum/gestioCOF#608
No description provided.
Delete branch "aureplop/restructuring"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?