Cacher is the code snippet organizer for pro developers

Merge conflict Close This pull request has conflicts.

You must resolve the conflicts by manually merging release/R1804 into this branch. After the conflicts are resolved you will be able to merge the pull request.

Step 1: Checkout the source branch and merge in the changes from the target branch. Resolve conflicts.

git checkout branch_name
git pull origin release/R1804

Step 2: After the merge conflicts are resolved, stage the changes accordingly, commit the changes and push.

git commit
git push origin HEAD

Step 3: Merge the updated pull request.