Merge develop into pre/2.8 #1846
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
May be better for another pair of eyes to take a look at the conflicting pieces of the code only rather than everything? Out of curiosity, did you merge and then rebase? Did the rebase introduce more conflicts? For these types of things (merge develop to and from release branches) we have been doing merging without rebasing. |
yaugenst-flex
force-pushed
the
yaugenst-flex/merge-develop
branch
from
1d31791
to
08768ea
Compare
|
@tylerflex @momchil-flex I split the merge into fast-forwarded changes and a commit with the conflict resolutions now (08768ea). This is not perfect as you don't get any insight into what was conflicting and how it was resolved, but at least you can see which conflicting changes are getting merged into |
tylerflex
approved these changes
Jul 22, 2024
CHANGELOG.md
Outdated
| @@ -1245,7 +1267,8 @@ which fields are to be projected is now determined automatically based on the me | |||
| - Job and Batch classes for better simulation handling (eventually to fully replace webapi functions). | |||
| - A large number of small improvements and bug fixes. | |||
|
|
|||
| [Unreleased]: https://github.com/flexcompute/tidy3d/compare/v2.7.0...develop | |||
| [Unreleased]: https://github.com/flexcompute/tidy3d/compare/v2.7.1...develop | |||
There was a problem hiding this comment.
you'll want to also add a tag for 2.8.0rc1 here
daquinteroflex
approved these changes
Jul 22, 2024
momchil-flex
force-pushed
the
yaugenst-flex/merge-develop
branch
from
4b9a441
to
3207199
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Supersedes #1840
Quite a lot of conflicts, would be great to have some other pairs of eyes on this.