Closed morganekmefjord closed 3 years ago
@carmat88 @Wrede can you resolve so we can make a final review?
@carmat88 @Wrede can you resolve so we can make a final review?
@morganekmefjord we are going through the conflicts. Unfortunately it is not just a matter of accepting the changes, for we are noticing some potential problems. So we need to go through them carefully.
@morganekmefjord Matteo and I have worked with trying to resolve merging conflicts between develop and master in STACKn and it's a mess to say the least. The reason for this is because the there was a gigantic "Revert" merge #205 in the master branch that's just a few commits behind current master HEAD. This merge involved 1,818 files. Trying to merge develop and master causes some very strange behaviors because of the "Revert" merge. Especially, we don't see conflicts where we expect them. I'm not going to go into the details why this is happening, but it's related to PR #205 , #204 and #203 . Matteo and I experimented with a copy of the master branch and reverted the HEAD to the stage before the "Revert" merge, if we do this and then merge with develop there is no conflicts at all! Our conclusion is that we should consider to do a hard revert of the master HEAD to the stage before the "Revert" merge, sine the only commit we will lose are related to some few changes in .github/workflow.
Closing this PR. Archive master and start new main branch and merge develop to main
Status
Description
Describe your changes here to communicate to the maintainers why we should accept this pull request. If it fixes a bug or resolves a feature request, be sure to include a link to that issue.
Types of changes
What types of changes does your code introduce to STACKn?
Checklist
If you're unsure about any of the items below, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
Further comments
Anything else you think we should know before merging your code!