Closed FHusko closed 5 months ago
Let's finish this PR because it is almost ready; and for other, larger changes, create a separate PR.
Your repository's observational data points to the master branch that is 2 months old.
To update the submodule: within your branch, go to the observational data submodule, then checkout
from the detached state to the master branch, then do git pull
on the master branch, and then check out to the latest commit in the master branch. Your pipeline-configs branch, which you are trying to merge here, should pick up that change in the state of the submodule. Just wrap that change into a new commit and push it here.
Okay, thanks! I think it should now be pointing to the correct version of the submodule.
Something went wrong: the submodule has not been updated fully. Its state has changed from being 2 months old to being 2 weeks old, but, for example, there was a comment yesterday to the master branch, which I cannot see in your branch.
Namely, based on your branch, I see
But the correct recent history of the observational data submodule should be https://github.com/SWIFTSIM/velociraptor-comparison-data/commits/master/
I hope it is finally matching.
Thanks, all looks good!!
The last remaining step before merging is to rebase to the latest version of the master branch pipeline-configs
.
When I do this (git rebase master
) it says that it is up-to-date.
On GitHub, I see that your branch is 3 commits behind.
I just noticed that you are merging a branch from a forked repository, instead of a branch from the original repository. This is why it may be more complicated to synchronize with the master branch of the original repository.
One problem with being out of sync, is that even though the submodule in your repo is now correct and up to date, in the file changes of this MR, I still see that the submodule is being updated, which should not be the case.
Thanks for noticing! Should be in sync now :)
Thanks! Now everything is indeed in sync. I've just merged the branch.
Thanks for the comments, @EvgeniiChaikin. Could you please remind me how I can update the reference to the observational data? I had forgotten that needs to be done, I thought it automatically points to the current master.
Unrelated to that, I am working to add very soon add high-redshift BH mass - stellar mass data, as well as BH mass functions. Would you prefer to add these (the changes to the pipeline required for those, I mean) as part of this PR, or a separate one?