Closed simoncozens closed 2 months ago
Hi @simoncozens , sorry but no experience here in such a big project : ( Which of the three merge options would you recommend ? (Create merge commit, squash and merge or merge and rebase) Thx!
I would personally use rebase and merge - that will add them to the list of commits in a single line, just as if we had committed all of these things onto the main branch, instead of "branching" off and then coming back. Squashing will lose history, so don't do that. Merge commit is OK but the history is a bit less clear.
That was my first idea, great. Thank you!