search

modelica / ModelicaStandardLibrary

Free (standard conforming) library to model mechanical (1D/3D), electrical (analog, digital, machines), magnetic, thermal, fluid, control systems and hierarchical state machines. Also numerical functions and functions for strings, files and streams are included.
https://doc.modelica.org
BSD 3-Clause "New" or "Revised" License
452 stars 165 forks source link

Add redundant algorithm #4290

Closed maltelenz closed 5 months ago

maltelenz commented 5 months ago

Backport #4284 to 4.1.0.

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

Harisankar-Allimangalath commented 5 months ago

@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 " d156b9b4e " ) .
  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 commented 5 months ago

@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 d156b9b4e9e5791ea8430ca0ac8659b9e14681c0 ).
  2. Now backport-4284 only has the particular change in d156b9b4e9e5791ea8430ca0ac8659b9e14681c0 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
Harisankar-Allimangalath commented 5 months ago

@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 .