feat: implement step to resolve conflict in release action PR

[makafsal]

Closes #6360

An additional step to resolve conflict by assuming the current chore/<tag>-release branch is ahead of origin/main. So, the -Xours option specifies the --ours strategy to merge by preferring current branch changes.

What did you change?

- name: Attempt merge and resolve conflict (if any)
        run: |
          git merge origin/main -Xours || true
          git push origin chore/${{ github.event.inputs.tag }}-release

How did you test and verify your work?

Manual (Github actions in forked repo)

[netlify]

✅ Deploy Preview for ibm-products-web-components ready!

Name	Link
🔨 Latest commit	b6467c7
🔍 Latest deploy log	https://app.netlify.com/sites/ibm-products-web-components/deploys/677e0a7f26ec430008772606
😎 Deploy Preview	https://deploy-preview-6670--ibm-products-web-components.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

---

To edit notification comments on pull requests, go to your Netlify site configuration.

[netlify]

✅ Deploy Preview for carbon-for-ibm-products ready!

Name	Link
🔨 Latest commit	b6467c7
🔍 Latest deploy log	https://app.netlify.com/sites/carbon-for-ibm-products/deploys/677e0a7fd749400009b4f50f
😎 Deploy Preview	https://deploy-preview-6670--carbon-for-ibm-products.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

---

To edit notification comments on pull requests, go to your Netlify site configuration.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 80.68%. Comparing base (8eeab4c) to head (b6467c7).
Report is 1 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #6670      +/-   ##
==========================================
- Coverage   80.70%   80.68%   -0.03%     
==========================================
  Files         397      397              
  Lines       12923    12923              
  Branches     4286     4286              
==========================================
- Hits        10430    10427       -3     
- Misses       2493     2496       +3     

Components	Coverage Δ
ibm-products	∅ <ø> (∅)
ibm-products-web-components	∅ <ø> (∅)

[matthewgallo]

Looks like it worked in your forked repo which is really cool! Just one small question, should there be a space between -X and ours?

[makafsal]

Looks like it worked in your forked repo which is really cool! Just one small question, should there be a space between -X and ours?

It is -Xours.