git push -f if you have permission, but that will screw up anyone else who pulls from that repo, so be careful. If that is denied, and you have access to the server, as canzar says below, you can allow this on the server with git config receive.denyNonFastForwards false
If you use git pull, you pull the changes from the remote repository into yours. If you send a pull request to another repository, you ask their maintainers to pull your changes into theirs (you more or less ask them to use a git pull from your repository). If you are the maintainer of that … Read more
This is vim, it’s a common unix editor press: :wq that’s it. (w=write q=quit)
You may need to remove unnecessary git objects such as dangling commits & blobs: git fsck && git gc –prune=now git-fsck : Verifies the connectivity and validity of the objects in the database git-gc : Cleanup unnecessary files and optimize the local repository You can refer here about dangling commits & blobs.
In this case the situation was that there was an unpushed commit at the tip of the master branch in one clone of the repository. Then git pull was run many times in the same repository, over a period of time when there was lots of new work being done upstream. (In this case, it … Read more
You can treat the second clone the same way you treat a remote respository on another system. You can perform all of the same operations, e.g. ~/repo1 $ git remote add repo2 ~/repo2 ~/repo1 $ git fetch repo2 ~/repo1 $ git merge repo2/foo
If the machine you want to pull from is accessible via ssh, you can add the repository on it as a remote via ssh, and then pull from it like you would any remote: $ git remote add repo_b username@host:path/to/repository.git $ git pull repo_b master (You can skip the step of adding a remote and … Read more
Well, I’m a former svn user too, and now use git for all my projects. When using git, you should change the way of thinking from the client-server architecture that’s used in svn. In svn, every change needs a connection with server. Using git, your repo is in the working directory. You don’t need a … Read more
git pull origin pull/28/head Or git fetch origin pull/28/head:28 git checkout 28 Can I pull a not-yet-merged pull request?
I just faced the same issue and solved it using the following.First clear tracked files by using : git clean -d -f then try git pull origin master You can view other git clean options by typing git clean -help