Hope I'm fine with naming the branch and commits
So what I did was opening a new branch from master after fetching latest changes, using git cherry-pick I selected the merge commit of the logging branch, then added the fix and some changes for new files that were not in the previous logging branch (training_extractor turned to training_storer) changes are in the second commit
Tested the app file and sent request to see that nothing is broken
Hope I'm fine with naming the branch and commits So what I did was opening a new branch from master after fetching latest changes, using
git cherry-pickI selected the merge commit of the logging branch, then added the fix and some changes for new files that were not in the previous logging branch (training_extractor turned to training_storer) changes are in the second commit Tested the app file and sent request to see that nothing is broken