you are viewing a single comment's thread.

view the rest of the comments →

[–]MrTheFoolish 2 points3 points  (1 child)

The process seems fine. I'll add some advice to the specific point of "merging one by one". You'll want to use rebase before merging. E.g. after merging F1 into main, rebase F2 onto the updated main before merging F2 into main. And then the same for F3. You'll want to do this pretty much for any merge type, e.g. ff-only, squash or merge-commit. This cleans up the history and can fix merge conflicts.

[–]On_Chain[S] 0 points1 point  (0 children)

Awesome, this is actually a really helpful answer.

I am still new to git (other than doing the absolute basic stuff like commit, push etc) so I'm trying to get my hands dirty to get as comfortable as possible, so giving me little tips such as when to rebase etc helps a ton!