Comment by Benjamin CARADEUC on "rebase vs merge and why, specifically when considering feature branches and dev one?"

I use both this way:

Rebase when pulling (git pull --rebase) so that it prevents creating merge commits on pull
Merge for real merges (when I mean to merge things) for feature to develop or develop to release for example

If I were more comfident with git, I think the only thing I'd do with rebase too is when I need to get back things from master or develop to a feature, so that it doesn't pollute the history of my feature branches

Does that make sense for the others here?

Search Hashnode