Closed bramvdh91 closed 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:
Experimental.Pipe
package into the up-to-date structureExperimental.Pipe
package to update all instances of Annex60
to IBPSA
(I would probably just use find/replace
in a text editor that supports such operations for all files in a directory - Atom in my case)Pipe
package
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!