Skip to content

Add redundant algorithm - #4290

Merged
AHaumer merged 1 commit into
modelica:maint/4.1.0from
maltelenz:backport-4284
Feb 2, 2024
Merged

AHaumer merged 1 commit into
modelica:maint/4.1.0from
maltelenz:backport-4284

Conversation

@maltelenz

Copy link
Copy Markdown
Contributor

Backport #4284 to 4.1.0.

This can replace #4289.
(cherry picked from commit d156b9b)

@Harisankar-Allimangalath

Copy link
Copy Markdown
Contributor

@maltelenz just for my understanding : so what you did here is

  1. you created a new branch from the master , cherry picking only the commit you are interested in (here its " d156b9b " ) .
  2. now this new branch only has this particular change , which is yet to be added to the maint/4.1.0 .
  3. so create a new PR linking this new branch and the maint/4.1.0.

doing so you are avoiding the conflicts right ? feel free to correct me .

Thankyou

@maltelenz

Copy link
Copy Markdown
Contributor Author

@maltelenz just for my understanding : so what you did here is

1. you created a  new branch from the master , cherry picking only the commit you are interested in (here its " [d156b9b](https://github.com/modelica/ModelicaStandardLibrary/commit/d156b9b4e9e5791ea8430ca0ac8659b9e14681c0) " ) .

2. now this new branch only has this particular change , which is yet to be added to the maint/4.1.0 .

3. so create a new PR linking this new branch and the maint/4.1.0.

doing so you are avoiding the conflicts right ? feel free to correct me .

Thankyou

Not quite right. What I did is:

  1. Create a new branch backport-4284 at the top of maint/4.1.0, cherry-picking the commit I would like to include (in this case d156b9b ).
  2. Now backport-4284 only has the particular change in d156b9b _ when compared to maint/4.1.0_, since that is where I created my new branch.
  3. Create this PR, requesting to merge backport-4284 into maint/4.1.0

@beutlich beutlich added L: Math Issue addresses Modelica.Math V: 4.1.0-dev Issue originates in MSL v4.1.0-dev (and is not present in earlier releases) labels Jan 29, 2024
@beutlich beutlich changed the title Back-port: Add redundant algorithm (#4284) Add redundant algorithm Jan 29, 2024
@beutlich beutlich added this to the MSL4.1.0 milestone Jan 29, 2024
@Harisankar-Allimangalath

Copy link
Copy Markdown
Contributor

@maltelenz just for my understanding : so what you did here is

1. you created a  new branch from the master , cherry picking only the commit you are interested in (here its " [d156b9b](https://github.com/modelica/ModelicaStandardLibrary/commit/d156b9b4e9e5791ea8430ca0ac8659b9e14681c0) " ) .

2. now this new branch only has this particular change , which is yet to be added to the maint/4.1.0 .

3. so create a new PR linking this new branch and the maint/4.1.0.

doing so you are avoiding the conflicts right ? feel free to correct me .
Thankyou

Not quite right. What I did is:

  1. Create a new branch backport-4284 at the top of maint/4.1.0, cherry-picking the commit I would like to include (in this case d156b9b ).
  2. Now backport-4284 only has the particular change in d156b9b _ when compared to maint/4.1.0_, since that is where I created my new branch.
  3. Create this PR, requesting to merge backport-4284 into maint/4.1.0

Thanks for clarifying @maltelenz , so I could do this steps in back porting of any other closed PR also right .

@AHaumer
AHaumer merged commit ce4e6bd into modelica:maint/4.1.0 Feb 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

L: Math Issue addresses Modelica.Math V: 4.1.0-dev Issue originates in MSL v4.1.0-dev (and is not present in earlier releases)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants