Markus Haarländer (Jul 22 2025 at 14:56): Markus Haarländer (Jul 22 2025 at 14:56):Hi there.
We're currently experiencing massive problems when trying to merge the v6.7 tag into our forked repository. We have done this same procedure for the last years without any issues.
The merge results in 78 conflicted files, most of them we've never touched on our side. Even the non-conflicted files are partially merged completely wrong, e.g. methods are duplicated. The resulting code is compeletely unusable.
Looking at the merge conflicts, it seems that git is trying to apply all changes from v6.6 again, although we are already on the v6.6 code base. It claims that the same changes from v6.6 are from another user than the ones from v6.7. Here is an example screenshot of the conflicted changelog.rst.
grafik.png
Is anyone else experiencing problems? Were there any changes in git history?
Thanks
Philip Durbin 🚀 (Jul 22 2025 at 15:00):Hi, I'm off to standup but we had to force push to master. Please see https://github.com/IQSS/dataverse/pull/11647#issuecomment-3085289132
Markus Haarländer (Jul 22 2025 at 15:01):Thanks Phil, I will check that link and the documents
Philip Durbin 🚀 (Jul 22 2025 at 15:31):Sure, I can tell you I was experiencing massive problems as well, back when I was trying to merge develop into master as part of of the 6.7 release!
This is all in the doc (Dataverse 6.7 release plan and fixes for master and 6.6), but I basically re-did the 6.6 release from a git perspective, including force-pushing the master branch back to 6.5 (last known good) so that I could bring it up to a clean 6.6, and then 6.7.
Markus Haarländer (Jul 23 2025 at 08:39):Ok, we reset our branch to a state before the merge of v6.6 and then re-applied the v6.6 and v6.7 tag and our custom changes. Seems to work, thank you so much for your help :tada:
Notification Bot (Jul 23 2025 at 08:39):Markus Haarländer has marked this topic as resolved.
Last updated: Nov 01 2025 at 14:11 UTC