Skip to content

Conversation

@lukaspie
Copy link
Contributor

@lukaspie lukaspie commented Jun 4, 2025

!!! This PR changes the git history !!!

With this PR, we clean up the unfortunate situation that after merging #1424, a large number of commits has been added to the repository history, whereas a squash commit would have been the better solution. This new branch removes these large number of commits and replaces it with a clean, squashed commit. It also gives proper credit to all contributors by having them automatically added to the commit message.

This branch was created using a script, see first comment. What it does:

  • Resets local main branch to exactly match the old main branch (we have this backupp-ed in https://github.com/FAIRmat-NFDI/nexus_definitions).
  • Creates a new branch where we prepare the fix.
  • Finds the point where the old main and the current state diverged — this helps identify the commits that were merged incorrectly. This is this commit: FAIRmat-NFDI@fe1709e (the merge of Fairmat 2024: use NXcoordinate_system together with NXtransformations #1415).
  • Collects all the people who contributed to those commits, so they get credited properly later.
  • Combines all those many commits into a single commit ("squash") on the new branch. This creates one clean commit with all the changes.
  • Adds a list of all contributors to the commit message so GitHub shows them as co-authors.

Note that you can check for yourself that no files in main are changed by checking out this branch locally and running git diff main (or on a fork git diff upstream/main).

Co-authored-by: Florian Dobener <florian.dobener@physik.hu-berlin.de>
Co-authored-by: Markus Kühbach <mkuehbach@users.noreply.github.com>
Co-authored-by: Peter Chang <peter.chang@diamond.ac.uk>
Co-authored-by: Ron <139139971+RonHildebrandt@users.noreply.github.com>
Co-authored-by: Ron Hildebrandt <RonHildebrandt@uni-leipzig.de>
Co-authored-by: Rubel <rubel.mozumder@outlook.com>
Co-authored-by: RubelMozumder <32923026+RubelMozumder@users.noreply.github.com>
Co-authored-by: RubelMozumder <rubelmozumder@outlook.com>
Co-authored-by: Sandor Brockhauser <sandor.brockhauser@physik.hu-berlin.de>
Co-authored-by: Sandor Brockhauser <sandor.brockhauser@xfel.eu>
Co-authored-by: Sherjeel Shabih <shabihsherjeel@gmail.com>
Co-authored-by: Tommaso <tommaso.pincelli@gmail.com>
Co-authored-by: Yichen <ycjin@physik.hu-berlin.de>
Co-authored-by: ca-palma <124777158+ca-palma@users.noreply.github.com>
Co-authored-by: domna <florian.dobener@physik.hu-berlin.de>
Co-authored-by: markus.kuehbach <markus.kuehbach@hu-berlin.de>
Co-authored-by: mkuehbach <markus.kuehbach@hu-berlin.de>
Co-authored-by: mkuehbach <markus.kuehbach@physik.hu-berlin.de>
Co-authored-by: rettigl <l.rettig@web.de>
Co-authored-by: sanbrock <45483558+sanbrock@users.noreply.github.com>
Co-authored-by: sanbrock <sandor.brockhauser@gmail.com>
@lukaspie lukaspie force-pushed the fix-squash-fairmat branch from 8e9d842 to 588894b Compare June 4, 2025 17:20
Copy link
Contributor

@PeterC-DLS PeterC-DLS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@lukaspie lukaspie merged commit 8b111da into nexusformat:main Jun 4, 2025
2 checks passed
@lukaspie lukaspie deleted the fix-squash-fairmat branch June 4, 2025 17:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants