Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lots of empty commit / bad merge from the Hugo docs tree #2449

Closed
bep opened this issue Feb 21, 2024 · 8 comments
Closed

Lots of empty commit / bad merge from the Hugo docs tree #2449

bep opened this issue Feb 21, 2024 · 8 comments
Assignees

Comments

@bep
Copy link
Member

bep commented Feb 21, 2024

E.g. 1083bf7

This is my mistake. Not sure what's happened (I suspect this happened when I deleted and recreated the docs sub tree in the hugo repo), and must have pushed these "orphan commits" when I released Monday.

I will have a look to see if I can find a Git magic command to fix this, but advice from some Git expert reading this would be appreciated.

/cc @jmooring

@bep
Copy link
Member Author

bep commented Feb 21, 2024

@jmooring I stupidly deleted/recloned the docs repo thinking it was a "local issue". If you have a local version with some history, could you:

  1. Do git reflog and find a commit that's Sunday or earlier and create a branch from that.
  2. Push that branch to this repo.

Then I should be able to fix the rest and do a force push once the branches are functionally the same.

@jmooring
Copy link
Member

@bep
Copy link
Member Author

bep commented Feb 22, 2024

@jmooring OK, I will fix this in the next few days. Thanks.

@bep bep self-assigned this Feb 22, 2024
@jmooring
Copy link
Member

@bep Is this resolved?

@bep
Copy link
Member Author

bep commented Apr 20, 2024

No.

@bep
Copy link
Member Author

bep commented Apr 23, 2024

@jmooring
I will try to fix the above in a separate branch now, but will add another "shout" to this PR before I'm doing any pushes. We need to fix this, and I don't think there's a way around a force push, but I will create a backup branch and double check the diff before doing anything.

@bep
Copy link
Member Author

bep commented Apr 23, 2024

@jmooring I need to push this for later ... the fix isn't obvious (to me, anyhow).

@jmooring
Copy link
Member

Closing per gohugoio/hugo#12430 (comment)

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

No branches or pull requests

2 participants