git reset - Githubissues

HedvigS commented 2 years ago

I'm confused by the last two commits made by Damián (97b47a5c2bfc274a7b0550e1baa6e32e52a6aadf and d03281698534759f9ab2c552136848fc445e69cd), they seem to involve a lot more changes than I think was intended. It's a bit tricky to read the diff log, and Damián has said he's happy if we just roll both back. Since he's already done a revert but that hasn't helped, i'd like to do a hard git reset to c64f25cddcef95f937afff8bb25719cce79748d2.

Before I do that and push it to remote etc I'd like either @johenglisch or @xrotwang to give their advice. It's a bit of an advanced move and I don't want to mess anything up.

xrotwang commented 2 years ago

What makes you think that the last commit didn't actually revert the one before? AFAICT, current HEAD is c64f25c:

$ git diff c64f25c..97b47a5

HedvigS commented 2 years ago

Thank you @xrotwang . I'm sorry, you're right I wasn't clear enough about what was confusing.

The current state of the repos has this content inside grambank-analysed/R_grambank/spatiophylogenetic_modelling/analysis/featurewise:

INLA_featurewise_autotyp_area.R
INLA_featurewise_dual.R
INLA_featurewise_extracting_marginals.R
INLA_featurewise_phylo_only.R
INLA_featurewise_plotting.R
inla_featurewise_poking.R
INLA_featurewise_set_up.R
INLA_featurewise_spatial_only.R
INLA_featurewise_trial.R

Which are scripts we were using a few weeks ago. I would expect it to only have these two files:

INLA_featurewise_visualising.R
grambank_dualplots.R

This is just one example, there are naturally other changes as well. Now that I'm looking at it again, the latest version of the repos that seems "correct" to me is the one right after Dinnage's commit commit 9a321cd82248587d6a8a339bbe26c4504cff8436

HedvigS commented 2 years ago

So, I'm sorry. I would like to reset to the state of the repos at Dinnage's commit "added joint posterior 68% ellipses to dual plots"

HedvigS commented 2 years ago

I don't understand fully what happened when Damian made the merging of branches, It looks to me like the revert didn't undo all that was done. How that can be I don't understand, I must admit to being a bit confused why the revert didn't reset everything.

HedvigS commented 2 years ago

I'd like to make the main branch of this repos protected to aovid future things like this, but as far as I understand from reading github.com that's not possible unless the org as a github team or enterprise account.

HedvigS commented 2 years ago

and thank the lords for git history ey? it's like @johenglisch said the other day, it's a very calming thing indeed 🙏 ^^

xrotwang commented 2 years ago

@johenglisch could you help @HedvigS with this?

HedvigS commented 2 years ago

I think maybe I've done the right thing in this branch?

What I've done there is just

git checkout 9a321cd

HedvigS commented 2 years ago

The other collaborators in this team want various things to be done asap, so in the meantime what I'll do is I'll work of a branch of this branch to do what's asked (#54 ) and if that branch is merged in, maybe that'll solve the conflicts in #51 as well.

HedvigS commented 2 years ago

@johenglisch and I spoke and I think he's fixed it with PR #57

grambank / grambank-analysed

git reset #53