Skip to content

Conversation

@nsjames
Copy link
Contributor

@nsjames nsjames commented Jun 25, 2025

No description provided.

@heifner
Copy link
Contributor

heifner commented Jun 25, 2025

Typically we do not merge directly from a release branch to main. Rather you should create a branch of main with release/3.10 merged into it. Also did you modify the release/3.10 directly (that should have been a PR). By creating a branch of main with release/3.10 merged into it you can then make sure main is in the correct state (no change to CMakeLists.txt).

git fetch --all
git checkout main
git checkout -b merge-3.0-main
git merge origin/release/3.10
modify CMakeLists.txt so that main remains the same
git push

@nsjames nsjames closed this Jun 25, 2025
@nsjames nsjames reopened this Jun 25, 2025
@nsjames nsjames closed this Jun 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants