Git error: fatal: Exiting because of an enresolved conflict. (Fixed)
Objective: To solve the git conflict issue
Detailed error: error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use ‘git add/rm <file>’
hint: as appropriate to mark resolution and make a commit.
Solutions:
Step 1: git status to list down the affected files
Add all files and commit it
Step 2: git add .gitlab-ci.yml && git commit -m “ first resolved 1”
Step 3: git add wp-content/wflogs/rules.php && git commit -m “resolverd merge conflicts 2”
Step 4: git add wp-content/wflogs/wafRules.rules && git commit -m “resolverd merge conflicts 3”
Step 5: git pull origin master
Step 6: Success!
