Team, Currently, it seems we have few patches missing in master but available in current running branch, could be attributed for various reasons.
Its hard to track some times that all changes made to make issue fixes work, are all available in master at any given time. I believe we can have an entry gate, that if the patch does not apply cleanly on either of the branch( and if it is supposed for both ), then its better we don't push it to both the branches, until the clean patch for both master and running branch are submitted again. This way, review will not be closed to submission. Otherwise, from bug fixes perspective, fixes should go hand in hand to both master and running branch i believe. Tracking manually through review\git log for missing patches may be little tedious and error prone again. You can see if there is a better way to track patch to completion for both and is proper. Thanks! Santhosh