Merge not working.

[claytakiler]

Select Topic Area

Question

Body

When trying to merge two branches, git doesn't recognize a conflict; it just deletes everything in the target branch and overwrites it with whatever is incoming. Git also believes that there are no conflicts despite there being clear conflicts. Any help with what could be happening would be appreciated. Thanks! This is my first time using this community, so I apologize if I am in the wrong place.

[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! 💬

[RohanShrivastava08]

It sounds like you're using the "ours" merge strategy, which accepts changes from the current branch and discards changes from the other.

Double-check your merge strategy using git merge --strategy=recursive (the default), or look for . gitattributes files that might force a specific strategy.

[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! 💬