Not really related to this answer, but I’d ditch git pull, which just runs git fetch followed by git merge. You are doing three merges, which is going to make your Git run three fetch operations, when one fetch is all you will need. Hence: Controlling the trickiest merge The most interesting part here is git merge -X theirs. As root545 … Read more
As it turns out, Git is smart enough not to drop a stash if it doesn’t apply cleanly. I was able to get to the desired state with the following steps: To unstage the merge conflicts: git reset HEAD . (note the trailing dot) To save the conflicted merge (just in case): git stash To return to master: git … Read more
My guess is that you are trying to add folder while you already are in folder. Instead, add everything in the folder, rather than the folder itself: To your other question, adding whole folders is fine, but only relevant when adding sub-folders. Again, you can’t git add the folder that is your repository (my_folder above). The usual way to add everything in … Read more
You can just run: and it will unstash your changes. If you want to preserve the state of files (staged vs. working), use
If you do a git pull with a remote branch name, it will fetch the remote branch and then merge it into your current local branch. So to undo that, you will first have to reset your local branch to the remote master, then create a new local vs12up branch from the corresponding remote branch. Reset your local master to match the … Read more
The list of untracked files reads (this is just a straight quote of your own quote): Now, note that there are only three names here that do not end with a slash: .gitignoreYou probably should add and commit this file, so you probably do want it to be untracked at the moment, until you add and commit it. 3dengine_headeronly.slnThis … Read more
Run this from the branch where you want the file to end up: General formulas: Some notes (from comments): Using the commit hash, you can pull files from any commit This works for files and directories Overwrites the file myfile.txt and mydir Wildcards don’t work, but relative paths do Multiple paths can be specified An alternative:
With version 2.13 of Git and later, –recurse-submodules can be used instead of –recursive: Editor’s note: -j8 is an optional performance optimization that became available in version 2.8, and fetches up to 8 submodules at a time in parallel — see man git-clone. With version 1.9 of Git up until version 2.12 (-j flag only available in version 2.8+): With version 1.6.5 … Read more
Finally I made it work thanks to the steps outlined in the Eclipse forum: Set up the SSH key stuff Download and install mysys git according to the github instructions at http://help.github.com/win-git-installation/ In C:/Users/you/ssh hide any existing keys (id_rsa and id_rsa.pub) in a subdirectory. If the ssh directory does not exist, create it. Of course, “you” is … Read more
As shown in How does “not something we can merge” arise?, this error can arise from a typo in the branch name because you are trying to pull a branch that doesn’t exist. If that is not the problem (as in my case), it is likely that you don’t have a local copy of the branch … Read more