Merging code into multiple branches
Let's say you have two branches one has code changes meant for hotfix release ASAP and the other for a new feature.
Unfortunately, both branches are different in the number of commits and have slightly different code coming from multiple developers.
...
