@@ -5,5 +5,13 @@ You may have to close opened figures to proceed with the simulation, depending o
...
@@ -5,5 +5,13 @@ You may have to close opened figures to proceed with the simulation, depending o
You can do a git interactive rebase following the steps explained [here](https://stackoverflow.com/a/179147). This enables you to squash several commits together and write a new commit message which sums up the changes in the code, this time following the push rules.
You can do a git interactive rebase following the steps explained [here](https://stackoverflow.com/a/179147). This enables you to squash several commits together and write a new commit message which sums up the changes in the code, this time following the push rules.
# How do I remove branches that were deleted from the remote ?
# How do I remove branches that were deleted from the remote ?
To prune remote branches, run : `git fetch -p`
To prune remote branches, run : `git fetch -p`.
To remove the local corresponding local branch, manually delete it : `git branch -d <branch-name>` (if it does not work and you are SURE you can delete the branch, use `git branch -D <branch-name>` to force delete it)
To remove the local corresponding local branch, manually delete it : `git branch -d <branch-name>` (if it does not work and you are SURE you can delete the branch, use `git branch -D <branch-name>` to force delete it)
# I can't create a branch and/or merge request
When creating a branch that does not follow the convention on branch names (see [Dev guide - creating the branch and merge request](https://gitlab.uliege.be/deal-public/pase/-/wikis/documentation/dev-guide#creating-the-branch-and-merge-request)), the branch creation workflow will block.
You should see something like the following screenshot : "Source branch <branchname> does not exist" on the merge request creation page.
