Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release/dev17.13 to main #18248

Merged
merged 3 commits into from
Jan 20, 2025
Merged

Merge release/dev17.13 to main #18248

merged 3 commits into from
Jan 20, 2025

Conversation

dotnet-bot
Copy link
Contributor

This is an automatically generated pull request from release/dev17.13 into main.

Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯

Troubleshooting conflicts

Identify authors of changes which introduced merge conflicts

Scroll to the bottom, then for each file containing conflicts copy its path into the following searches:

Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts.

Resolve merge conflicts using your local repo

Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub.

git fetch --all
git checkout -t upstream/merges/release/dev17.13-to-main
git reset --hard upstream/main
git merge upstream/release/dev17.13
# Fix merge conflicts
git commit
git push upstream merges/release/dev17.13-to-main --force

Copy link
Contributor

✅ No release notes required

@vzarytovskii
Copy link
Member

@0101 for you awareness, this should be the same as it is in main.

@0101
Copy link
Contributor

0101 commented Jan 20, 2025

@0101 for you awareness, this should be the same as it is in main.

What should? Do you mean main should stay as it is? - That's what I thought. We just need to make the bot stop trying to merge this...

@T-Gro T-Gro enabled auto-merge January 20, 2025 16:52
@T-Gro T-Gro disabled auto-merge January 20, 2025 16:53
@0101 0101 merged commit 686dcab into main Jan 20, 2025
4 checks passed
@vzarytovskii
Copy link
Member

@0101 for you awareness, this should be the same as it is in main.

What should? Do you mean main should stay as it is? - That's what I thought. We just need to make the bot stop trying to merge this...

To stop bot from merging it you generally need to do what Tomas did - edit file, sync with main, make a commit, merge without squashing.

@T-Gro T-Gro deleted the merges/release/dev17.13-to-main branch January 21, 2025 10:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants