Try deleting index.lock file in your .git directory. rm -f .git/index.lock Such problems generally occur when you execute two git commands simultaneously; maybe one from the command prompt and one from an IDE.
git rev-parse is an ancillary plumbing command primarily used for manipulation. One common usage of git rev-parse is to print the SHA1 hashes given a revision specifier. In addition, it has various options to format this output such as –short for printing a shorter unique SHA1. There are other use cases as well (in scripts and other tools built on top of … Read more
Moving to an existing branch If you want to move your commits to an existing branch, it will look like this: You can store uncommitted edits to your stash before doing this, using git stash. Once complete, you can retrieve the stashed uncommitted edits with git stash pop Moving to a new branch WARNING: This method works because you … Read more
First, checkout to your Branch3: Then merge the Branch1: And if you want the updated commits of Branch1 on Branch2, you are probaly looking for git rebase This will update your Branch2 with the latest updates of Branch1.
You should really have a workflow that lets you do this all by merging: So all you have to do is git checkout v2.1 and git merge wss. If for some reason you really can’t do this, and you can’t use git rebase to move your wss branch to the right place, the command to grab a single commit from … Read more
If you did a clone, then all branches should be available to you. You need to checkout the branch. git checkout todo-mvvm-databinding If the branch isn’t available for whatever reason, then you can create it and then pull it: git checkout -b todo-mvvm-databinding (-b specifies “create branch”) git pull origin todo-mvvm-databinding will fetch and merge this branch into … Read more
do i need to configure proxy settings? because my office has got proxy servers. Yes, you can do so by setting HTTP_PROXY, and HTTPS_PROXY environment variables. See “Syncing with github“: (To avoid putting your credentials — username/password — in clear in the proxy URL, see below) Note the NO_PROXY, to allow to access internal site to your company You … Read more
Use git rm. If you want to remove the file from the Git repository and the filesystem, use: But if you want to remove the file only from the Git repository and not remove it from the filesystem, use: And to push changes to remote repo
With git rm –cached you stage a file for removal, but you don’t remove it from the working dir. The file will then be shown as untracked. Take a test drive With git reset <file> you can unstage a file. In the example above you might want to use git reset test to unstage the removal.
Git has a limit of 4096 characters for a filename, except on Windows when Git is compiled with msys. It uses an older version of the Windows API and there’s a limit of 260 characters for a filename. So as far as I understand this, it’s a limitation of msys and not of Git. You … Read more