I have 2 separate develop branches in Git, develop1 and develop2. These 2 branches have a common ancestor, commit C1 on master. These 2 branches contain 2 product releasecycles will will be joined in about 6 months (both merged into master).
Before the big merge in 6 months, branches develop1 and develop2 will be kept separate, no merging between develop1 <-> develop2 will be done.
However, some changes (like project structure, script changes) will be done on both branches.
My idea is to perform these changes on develop1, then cherry-pick them to develop2.
My questions:
- Is this wise to do?
- Will this result in problems later when performing the big merge?
The reason I'm asking this is because I've read that cherry-picking may result in problems because new commits are created.
One reference listing the possible problem: http://blog.founddrama.net/2013/07/git-cherry-pick/