If multiple people are working on the same branch, the current guidance is to have users use git pull before pushing their commits (as otherwise their push will be rejected). However, this results in git calling git merge, which will result in unhelpful merge commits cropping up in a pull request. This has already happened multiple times with pull request #116.
A slightly better approach would be to rebase when using git pull (git pull --rebase). This way the git commit history is a little more clear as you can see the progression of the feature branch better.
This will of course not work if there is a merge conflict. In which case a regular git pull is required.
Contact Details
No response
Fault type
Incorrect/outdated information given
Please describe the fault in detail
If multiple people are working on the same branch, the current guidance is to have users use
git pullbefore pushing their commits (as otherwise their push will be rejected). However, this results in git callinggit merge, which will result in unhelpful merge commits cropping up in a pull request. This has already happened multiple times with pull request #116.A slightly better approach would be to rebase when using git pull (
git pull --rebase). This way the git commit history is a little more clear as you can see the progression of the feature branch better.This will of course not work if there is a merge conflict. In which case a regular
git pullis required.