-
Notifications
You must be signed in to change notification settings - Fork 58
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
Aggregate structure, construction & geometry branches #1883
Open
brgix
wants to merge
31
commits into
nrcan
Choose a base branch
from
nrcan_450
base: nrcan
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,467
−706
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
Including nrcan branch changes into nrcan_446
Merging nrcan branch into nrcan_446 branch
Initializes nrcan_446 branch: skylights & wells
Merges cumulated changes in nrcan_450
Merges cumulated changes in nrcan_450
Adds (then zeroes) door PSI-factors for NECBs
Adds building STRUCTURE parameters (BTAP)
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.
A number of ongoing tasks are aiming to alter how BTAP sets, inter alia:
Some of the targeted branches include 1854 & 1882.
The initial plan was to merge individual branches with nrcan branch, one by one, in some preset sequence. As work progressed, that sequence couldn't necessarily be followed to the letter, as further iterations were needed. These branches are also highly interlinked - a change in one branch requiring synced changes in another. A merge with nrcan branch isn't foreseen very soon (in a month or so, yes - but not in the immediate future), which is making current harmonizing efforts a bit burdensome.
The task here is to simply create a single, intermediate branch to facilitate managing/harmonizing individual contributions (branches) before attempting a merge with nrcan branch. Continuously merging in other nrcan branch updates will continue for each of these branches individually, and for this intermediate branch, offering some flexibility to merge in some (or all) branches into nrcan branch at some point.