FOSS gamedev and creative worlds

Hello, here's the problem: Due to a messup in a commit, something (either github or my local copy) thinks that the files I want to push to github are already there, even though they're just on the local copy. This is the repo in question: https://github.com/BBmine/noob_academy.

I'm kind of a noob at github, so please tell me how to do what I need to do.

If I understand correctly, you're saying that GitHub won't accept the commit(s) that you are trying to push because it thinks they are already there? If so, do:



(Where origin is the name of the remote)

Essentially, the above forces the commit(s) to be pushed no matter what. Hope that helps!

Force-pushing to a repo should only be used if strictly necessary as you may break stuff.

BBmine: Can you say which steps are you performing, and any actual error messages you get? Don't paraphrase. Either copy/paste or take a screenshot.

cd git_repo
git add --all
git commit -m "message"
"nothing to commit, working tree clean"
git push --all
"Everything up-to-date"
ls

On https://github.com/bbmine/noob_academy. Notice the images for the folders "advtrains" and "letters". Also, those aren't really folders. The local repo actually has stuff in the folders.

BBmine wrote:On https://github.com/bbmine/noob_academy. Notice the images for the folders "advtrains" and "letters". Also, those aren't really folders. The local repo actually has stuff in the folders.

Make sure those subfolders are not git repos themselves. If they are, then run "rm -fr .git" inside them to turn them into regular folders.

Morn76 wrote:

BBmine wrote:On https://github.com/bbmine/noob_academy. Notice the images for the folders "advtrains" and "letters". Also, those aren't really folders. The local repo actually has stuff in the folders.

Make sure those subfolders are not git repos themselves. If they are, then run "rm -fr .git" inside them to turn them into regular folders.

Um, they are git repos. Okay, if they can't be git repos, then how do I make sure the most up-to-date stuff is being pushed?

BBmine wrote:Um, they are git repos. Okay, if they can't be git repos, then how do I make sure the most up-to-date stuff is being pushed?

You can use git submodules to create a link from your repository to either the latest versions or a specific commit of those mods.

But personally I've never done that; I always convert a mod to a regular folder, effectively forking it, so I can't tell you much more about how submodules work exactly.

Morn76 wrote:

BBmine wrote:Um, they are git repos. Okay, if they can't be git repos, then how do I make sure the most up-to-date stuff is being pushed?

You can use git submodules to create a link from your repository to either the latest versions or a specific commit of those mods.

But personally I've never done that; I always convert a mod to a regular folder, effectively forking it, so I can't tell you much more about how submodules work exactly.

I could make a folder called noob_academy_repos and pull --all the mods in that folder. Also in that script, I could have