bramvdh91 / modelica-ibpsa

Modelica libraries that are used and/or developed within IEA EBC Annex 60
0 stars 0 forks source link

Update pipe model development with IBPSA master branch #73

Closed bramvdh91 closed 7 years ago

bramvdh91 commented 7 years ago

This pull requests yields over 600 merge conflicts, among which a number of package.mo files on which git mergetool doesn't even know what to do... @mwetter @marcusfuchs any experience with this type of merges or could you identify if I did something wrong? Thanks in advance!

marcusfuchs commented 7 years ago

@bramvdh91 Sorry, I only had time to have a quick look at the conflicts. While it may be possible to fix this in git, I would suggest a pragmatic approach: