Author, dont’ you know, that git merge --no-ff exists? After rebase you should not merge your feature with fast forward, but create merge commit. So rebase will help to analyze what you did without exploding brains, and no fast-forward merge will help others see the boundaries of your feature.

Git flow also invented. Rebase is forbidden in trunk-like branches like master/develop, but in feature branches you should rebase often.

If you have many conflicts with develop/master — then its’ a clear sign, that your team has bad code base of bad focusing, when many people do same things instead of their own focused features.

Also git has nice feature called rerere. Just google it.