Resolve Merge conflicts

[madhu-us]

Select Topic Area

Question

Body

When I raise a pull-request from feature branch to sprint branch. when I'm clicking the resolve conflicts in the pull request tab.
after resolving the conflicts, both feature and sprint branches are updated. but I want to update the sprint branch only, not feature branch.
In detail the changes are reflected to feature and sprint branch.
Is it default setting or can I change it to update the sprint branch only. can anyone help me on this how to do it.

[github-actions[bot]]

🕒 Discussion Activity Reminder 🕒

This Discussion has been labeled as dormant by an automated system for having no activity in the last 60 days. Please consider one the following actions:

1️⃣ Close as Out of Date: If the topic is no longer relevant, close the Discussion as out of date at the bottom of the page.

2️⃣ Provide More Information: Share additional details or context — or let the community know if you've found a solution on your own.

3️⃣ Mark a Reply as Answer: If your question has been answered by a reply, mark the most helpful reply as the solution.

Note: This dormant notification will only apply to Discussions with the Question label. To learn more, see our recent announcement.

Thank you for helping bring this Discussion to a resolution! 💬