Home/ Questions/Q 8004859
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-06-04T17:03:06+00:00

i’m trying to push local changes: git push all all means repo on github

  • 0

i’m trying to push local changes:

git push all

“all” means repo on github and remote server – in my .git/config:

[remote "all"]
    url = git@github.com:...myrepo.git
    url = ssh://usrname@servername/myrepo.git/

originally it was presumed that nothing should be changed manually on server, but eventually it did happen. however the changes on the server are insubstantial, and i want to override them to have an exact replica of my local repo. so, now i can’t push to the remote server obtaining an error:

remote: error: Your local changes to the following files would be overwritten by merge:
remote: Please, commit your changes or stash them before you can merge.

i am aware of previous answers to similar question, but unfortunately “git push origin –force all” doesn’t work, throwing the same error

please, help! thanks in advance!

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    Ok it makes perfect sense then. Your remote on your network is not bare. Ie, you work on it; it has it’s own working directory. In fact the branch you are trying to push to is currently checked out. To add, you also have some modifications that are not committed yet. Git will refuse to zap your changes over there.

    The proper workflow is to pull the changes from there on the remote.

    However, you can also

    • get to a headless state by checking out a particular commit, not a branch, on the remote repo.
    • make it a bare repository, if it truly is a central one where others are going to use it or a CI server is going to query it. This is done with git clone --bare.
    • 0