first i mirrored the repo in case i messed something up.
I hard reset the head back 3 commits. Copied the updated files back to the repo and created a new branch for them.
I hard reset the head back 3 commits. Copied the updated files back to the repo and created a new branch for them.
metulburr@ubuntu:~/repos/ShooterGame$ git checkout -b cleanup_after_menu M data/states/game.py M data/states/game_over.py M data/states/menu.py M data/states/options.py M data/tools.py Switched to a new branch 'cleanup_after_menu' metulburr@ubuntu:~/repos/ShooterGame$ git add . metulburr@ubuntu:~/repos/ShooterGame$ git commit -m "cleanup after adding menu" [cleanup_after_menu ec53c60] cleanup after adding menu 6 files changed, 118 insertions(+), 118 deletions(-) create mode 100644 data/menu_manager.py metulburr@ubuntu:~/repos/ShooterGame$ git push origin cleanup_after_menu Username for 'https://github.com': GONE Password for 'GONE': Counting objects: 10, done. Delta compression using up to 8 threads. Compressing objects: 100% (10/10), done. Writing objects: 100% (10/10), 1.56 KiB | 0 bytes/s, done. Total 10 (delta 7), reused 0 (delta 0) remote: Resolving deltas: 100% (7/7), completed with 6 local objects. remote: remote: Create a pull request for 'cleanup_after_menu' on GitHub by visiting: remote: https://github.com/metulburr/ShooterGame/pull/new/cleanup_after_menu remote: To https://github.com/metulburr/ShooterGame.git * [new branch] cleanup_after_menu -> cleanup_after_menuThe comparison is correct as it goes to from the correct branch to the correct branch. However the old branches are still there. Its not a big deal as the comparison is correct in the last new branch, but i am wondering how these branches exist if i reset it back 3? Or is that because i never merged them into master in the first place? It also does not show in git log, but shows on the website.
metulburr@ubuntu:~/repos/ShooterGame$ git log commit ec53c60f29b4a1586a26fa5e0a7cc95f124f9d13 Author: metulburr <[email protected]> Date: Wed Jan 29 08:33:58 2020 -0500 cleanup after adding menu commit ecef4a5220f182eac15fd3f6351f86e6dea4f833 Author: metulburr <[email protected]> Date: Sat Jan 25 22:51:47 2020 -0500 added game over and restart commit 787630dd7e44b44e4f25d0ca64737b7fa3020659 Author: metulburr <[email protected]> Date: Sat Jan 25 19:13:42 2020 -0500 added options menu commit 7944f090e52e3ca908fa6756ce71247b1c56151e Author: metulburr <[email protected]> Date: Sat Jan 25 18:57:35 2020 -0500 added basic menu system commit 3308118fbc6d41636fbad30759976c03dbc947ee Author: metulburr <[email protected]> Date: Sat Jan 25 18:00:39 2020 -0500 organizing states
Recommended Tutorials: