We have two branches master and test branch. Test branch is slightly different than master because of some features that were added to test but not master. Whenever I create a new branch from master let’s say MDW-1 and make my changes there and try to merge it in test, it can’t merge without conflict because it tries to remove all the features from test branch that are not in master branch. So the temporary solution right now is to checkout test-MDW-1 from test branch and cherry pick changes from MDW-1 to test-MDW-1. This is redundancy because we have two create two branches for same changes. What would be the solution for this? This was not the case a few days back. I could easily merge the branch checked out from master into test branch. This arose after I reverted a pull request from master branch.