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.

Sign up for GitHub

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

Jump to bottom

Happy new year! #6799

Merged
merged 1 commit into from
Jan 3, 2018
Merged

Happy new year! #6799

merged 1 commit into from
Jan 3, 2018

Conversation

markknol
Copy link
Member

@markknol markknol commented Jan 1, 2018

🎉 Its 2018! 🎉

@andyli
Copy link
Member

andyli commented Jan 2, 2018

What's changed in the submodules (haxelib and ocamllibs)? It's quite likely the cause of CI failure, but GitHub doesn't show the changes properly to me...

@andyli
Copy link
Member

andyli commented Jan 2, 2018

Looked more closely, the submodules are reverted to older commits (which shouldn't). Please fix that ;)

@markknol
Copy link
Member Author

markknol commented Jan 2, 2018

OOPS!
Can you help me, I have no idea how to fix this (no git expert).

@andyli
Copy link
Member

andyli commented Jan 2, 2018 •
edited
Loading

Roughly:

  1. check out your 2018 branch
  2. git reset --soft HEAD~ (reset the 2018 branch "pointer" to the previous commit but keeping all the current changes in the staging area)
  3. git reset extra/haxelib_src and git reset libs to unstage the submodule changes
  4. git commit -m "Happy new year!"
  5. git push --force to overwrite the remote 2018 branch

@markknol
Copy link
Member Author

markknol commented Jan 2, 2018

That works!

@andyli andyli merged commit b3cc1d7 into HaxeFoundation:development Jan 3, 2018
@markknol markknol deleted the 2018 branch January 3, 2018 08:37
back2dos pushed a commit to back2dos/haxe that referenced this pull request Oct 5, 2021
@markknol @andyli
Happy new year! (HaxeFoundation#6799)
52465a8
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@markknol @andyli