[ggregoire]

That's what I was thinking. I barely understand how git works but I've never had issues neither. Could be because people don't have a good workflow.

Mine is as simple as:

- git pull -r (to pull & automatically rebase commits from the common branch)

- git checkout -b (to create my own feature/debug branch from the common branch)

- git add -A/commit -m/push (to add, commit and push… I usually let my IDE handle that part)

- git rebase (to rebase commits from the common branch)

- git reset (to squash all the "WIP" and "fix" commits on my feature/debug branch. I then do 1 or 2 clean commits and push -f)

- finally I do a merge request, or directly git cherry-pick the commits to the original branch if nobody else works on the project

I've been doing this for years and it just works.