resolve conflicts merging 11.0.x

[garyvvaughan]

Problem

$ git checkout 11.1.x
$ git merge 11.0.x
CONFLICT (modify/delete): Jenkinsfile deleted in 11.0.x and modified in HEAD.  Version HEAD of Jenkinsfile left in tree.
CONFLICT (modify/delete): sonar-project.properties deleted in HEAD and modified in 11.0.x.  Version 11.0.x of sonar-project.properties left in tree.
Automatic merge failed; fix conflicts and then commit the result.

Solution

$ git rm Jenkinsfile sonar-project.properties
$ git commit
[gvaughan/resolve-conflicts-merging-11.0.x 671aaa3] Merge branch '11.0.x' into gvaughan/resolve-conflicts-merging-11.0.x

Does this solution apply anywhere else?

• yes
• no

If yes, where?

Test Strategy

Testing done:

• Unit tests
• Integration tests
• System tests
• Manual tests

Release Plan

[cla-assistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 5 committers have signed the CLA.

✅ sp-gupta
✅ garyvvaughan
❌ cprovencher
❌ ConfluentSemaphore
❌ Ganesh Datta

---

Ganesh Datta seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}