@hansolsson874

In many cases I prefer "Squash Merge"; as it gives a clear history without the back-and-forth changes. But it depends.