-
I solved the conflicts
-
mentioned in commit bd0f343292b7452ac725eeabbc1bb19e9c9c7506
-
Status changed to merged
Step 1. Update the repo and checkout the branch we are going to merge
git fetch origin git checkout -b JACK origin/JACK
Step 2. Merge the branch and push the changes to GitLab
git checkout master git merge --no-ff JACK git push origin master
I solved the conflicts
mentioned in commit bd0f343292b7452ac725eeabbc1bb19e9c9c7506
Status changed to merged