Messed up my first code commit

[johnwslongland]

Select Topic Area

Question

Body

Good day
I have created my first repository and wanted to commit my code from my Ubuntu 22.0 server to my repository.
I used
git init -b main
to initialise, but I did the push with
git push -u origin master

As part of my efforts to recover this, I deleted the repository and created a new one. Now I cannot do anything
because git thinks all is up to date.

I tried
git reset --hard HEAD
together with
git push -u origin --force
but I am still stuck

a real newbie error. but if someone can assist me out of this mess I would appreciate.

[MuchaSsak]

I tried to replicate your situation and I couldn't even push to my repo. Got an error saying: src refspec master does not match any

If you want to delete an accidentally created master branch, simply run git branch -d master

But I see that you have just initialized this repository, so if you really are stuck then you might just run rm .git in your directory.
Basically delete the .git folder and try again. I don't know what else to recommend because I don't fully understand the issue.

[CodersHub2030]

Addressing the Remote Repository Misconfiguration:

Reconnecting to the New Home: Since you recreated the repository, your local Git configuration needs to be updated with the new remote URL. Execute the following command in your terminal:
git remote set-url origin <new_remote_repository_URL>
Replace <new_remote_repository_URL> with the actual URL of your new repository. Think of it as updating the shipping address on a package to ensure it reaches its intended destination.

Branch Renaming (Optional): If the new repository uses "main" as the default branch instead of "master," you can adapt your local branch accordingly. Choose one of the following options:
Renaming:
git branch -m master main
Deletion and Recreation:
git branch -D master as @MuchaSsak mentioned earlier
git checkout -b main Remember aligning your local branch name with the remote repository's standard ensures smooth sailing during future pushes.

Resolving the Out-of-Sync State:
Forceful Push (with Caution): To push your local main branch to the remote main branch, even if it already exists, use the following command (with caution):
git push -u origin main --force
This essentially overrides any existing content on the remote main branch with your local changes. Think of it as carefully delivering a revised document, replacing the outdated version.

Recommitting Changes (if necessary): If the git reset command erased your local commits, recover them by adding and committing them again:
git add .
git commit -m "Recommitting local changes"
Imagine gathering scattered notes and organizing them into a coherent report before submitting it.

Final Push: Once your local state is in order, push your changes to the remote repository once more:
git push origin main
This final step effectively delivers your code to its new digital home.
I hope its helpful.

[faridnec]

You might consider force push your local changes to the remote repository, after initialize main branch and add remote repo,

git push -u --force origin main

This sequence of commands initializes a new Git repository, sets up the remote origin, and forcefully pushes your local changes to the remote main branch. Though be cautious when using force push (--force) as it overwrites the remote repository with your local changes. Ensure you have a backup or are okay with losing any existing remote history.

[johnwslongland]

Good day all

I see that I have not responded to these suggestions. Please accept my apologies for this oversight !!

Thank you very much for these suggestions. In the end I did a "force" because I knew there was no history that I will loose.

And I can see my code in github and it all seems good.

Thank you again.