Thanks for the information. Based on my situation I think I will go with Solution 1 as I prefer to keep a clean and linear git history. I am a bit concerned about the potential conflicts that may arise when rebasing the feature branch onto the main branch. Can you give me some tips on how to handle conflicts during a rebase?