How do people feel about the merge strategy with OpenMRS commits? I just did a rebase on the 1.12x branch and pushed, which resulted in a slightly different history from openmrs. Does anyone feel that its important to keep the same history as the openmrs branch? This would mean that we will have merge commits.
I feel avoiding merge commits is nice. And so would prefer that we use rebase wherever possible when taking code from openmrs, just like we would with a PR. We could also do cherry-picking instead of taking all of commits. But I think we should avoid that until we are in a space where we have many devs. What do others think?