-
Notifications
You must be signed in to change notification settings - Fork 166
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
Update CoupledClutches.mos #4348
Conversation
Updated to Dymola command set from this millennium.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Would be better to merge first to master and cherry-pick to maint branch after merge. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok
as @beutlich said, merge to master, then to maint/4.1.0
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fine to me.
It would help to have some document that describes "best practices". Git permits many different ways to use the system, branching, etc. I'm happy to march along, if somebody just points in the right direction. |
@DagBruck Check out |
Thats for the pointer @dietmarw but I must admit I was confused by what it says:
The way I read it, the maintenance branch is created after the new release has been created, and then you can apply bug fixes to 4.0.x versions. Is that correct? What makes me confused is that we have |
Well naming the branch |
The base branch was changed.
@HansOlsson suggested I create a new pull request for the master branch: #4350. |
Updated to Dymola command set from this millennium.