Git: Merge or Rebase?

This is a holy war and only the righteous (git rebase) can prevail.

Rebase, but dont mess with the dates while doing it.

   --committer-date-is-author-date

This didnt use to work with interactive rebase (-i), until 2 years ago!! Wild.

https://stackoverflow.com/questions/2973996/git-rebase-witho...

Rebase, except for situations where a branch has multiple commits and the state of the branch isn't complete until all of them are merged, in that case you probably want merge. For example porting from GTK 2 to GTK 4, probably use multiple commits for each API being ported, then merge the branch at the end.