Example of rewriting PR commits in draft mode before requesting proofreading

[dzc34]

PR source : https://github.com/demarches-simplifiees/demarches-simplifiees.fr/pull/9418/commits

Currently

Proposal

How do I do it?

# Update from remote repositories
git remote -v
git remote update -p
  # adullact	[email protected]:adullact/demarches-simplifiees.fr.git (fetch)
  # adullact	[email protected]:adullact/demarches-simplifiees.fr.git (push)
  # dinum	https://github.com/demarches-simplifiees/demarches-simplifiees.fr.git (fetch)
  # dinum	https://github.com/demarches-simplifiees/demarches-simplifiees.fr.git (push)

# Position yourself on the branch to be reworked
git checkout -b feature-ouidou/admin_creation_delegation adullact/feature-ouidou/admin_creation_delegation

# Cancel branch commits, but keep modifications in the workspace
git reset --mixed 2023-09-04-01

# Logically add files to multiple commits
git status
git add app/models/
git add db/migrate/
git add spec/models/
git commit -m "feat(gestionnaire): add new models (Gestionnaire and GroupeGestionnaire)"

git status
git add config/routes.rb
git add config/env.example.optional
git commit -m "feat(gestionnaire): add new super-admin routes"

git status
git add config/locales/
git commit -m "feat(gestionnaire): fill in i18n files"

git status
git add app/views/user_mailer/
git add app/views/groupe_gestionnaire_mailer/
git add app/mailers/
git add spec/mailers/
git commit -m "feat(gestionnaire): add mailers"

git status
git add app/controllers/manager/
git add app/dashboards/
git commit -m "feat(gestionnaire): add super-admin controllers"

git status
git add app/controllers/gestionnaires/
git add app/helpers/
git add app/views/
git commit -m "feat(gestionnaire): init  Gestionnaire page"

git status
git add spec/factories/
git commit -m "feat(gestionnaire): add missing spec"

git status
git add app/controllers/application_controller.rb
git commit -m "feat(gestionnaire): add gestionnaire to application_controller.rb"

git status
git add app/controllers/application_controller.rb
git commit -m "feat(gestionnaire): add gestionnaire to application_controller.rb"

git status
git add db/schema.rb
git commit -m "db: update schema.rb"

# Overwriting the remote branch with new commits
git push adullact --force feature-ouidou/admin_creation_delegation