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

ENHANCE: add issue tracker for alternative contact to mailing list #4

Draft
wants to merge 13 commits into
base: main
Choose a base branch
from

Conversation

njsch
Copy link
Member

@njsch njsch commented Jul 4, 2022

Speaks for itself, requesting comment.

Copy link
Member

@lukaszgo1 lukaszgo1 left a comment

Choose a reason for hiding this comment

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

While the content of this contribution is okay, your branch contains a lot of commits which should not be there. Please rebase it interactively on main and then force push, so that commits from the conversion to Jekyll are removed from this PR.

@njsch
Copy link
Member Author

njsch commented Jul 5, 2022

I have these hashes from invoking “git reflog”

e21d394 (HEAD -> njsch-add-issues, origin/njsch-add-issues) HEAD@{2}: pull: Fast-forward
439db01 (main) HEAD@{4}: pull: Merge made by the 'ort' strategy.

So if I invoke

git revert -m 1 <merge-hash>

, would this help? I've messed up my local main somehow.

@lukaszgo1
Copy link
Member

If your local main is messed up the easiest strategy would be to clone a fresh repository and then rebase this branch on main.

@lukaszgo1
Copy link
Member

Unfortunately this is even worse than before. Not only your local main is messed up but your remote one is also broken, thanks to the fact that you've submitted #3 from it.

This can be fixed as follows:

Add the original repo as remote if not done already:
git remote add upstream https://github.com/latex-access/latex-access.github.io/
Fetch the remote branches:
git fetch upstream
Create a local branch based on the upstream main so that we can reset main branch of your fork to a known good state:
git switch -c origMain upstream/main
Go back to your local main:
git checkout main
Restore your main to a good state:
git reset --hard origMain
Forcibly push your changes to the remote:
git push --force

After it is done let's fix branch from this PR.
Check it out first:
git checkout njsch-add-issues
Then rebase interactively on the fixed main to remove unnecessary commits:
git rebase -i main
In the editor remove all content and paste the following:

pick c6bf355 ENHANCE: add Github community/issues for contact as well as mailing list.
squash f908100 End last sentence in update.

Accept the commit message and finally git push --force

Hope this helps, and gives you a good lesson to never, ever submit any contributions from the main branch ever again.

@lukaszgo1 lukaszgo1 marked this pull request as draft July 11, 2022 05:53
@lukaszgo1
Copy link
Member

Marking as a draft until excessive commits are removed.

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