How to clean release: Commits differ on master and develop post release

[jh-RLI]

@henhuy, as you noticed, there is always (I assume since you merged master back to develop) a diff between master and develop after I do a release - I follow the Vincent Diressen workflow, but I think I missed something as sometimes the branches are in sync, but most of the time they differ by 2-3 commits, but actually contain the same content. Maybe this is because github creates additional merge commits? Or do i have to use another merge strategy.

Maybe you have an idea how to make it cleaner :)

[henhuy]

Yes, I saw this and merged main into develop again...
But this is not the correct way either I think.
Normally the release branch should be merged into main and develop and there shouldn't be a difference between dev and main afterwards?

[jh-RLI]

Yes I thought so too, but this never works out, I always merge the release branch into master/main and then dev. Kinda strange - must be some GitHub dark magic.