To stash your working directory including untracked files (especially those that are in the .gitignore) then you probably want to use this cmd: Alternatively, you can use the shorthand -u instead of –include-untracked, or simply git stash –all which stashes all files, including untracked and ignored files. This bahaviour changed in 2018, so make sure your git is up to date. Warning: there seems to … Read more
See the git-pull man page: git pull [options] [<repository> [<refspec>…]] and in the examples section: Merge into the current branch the remote branch next: $ git pull origin next So I imagine you want to do something like: To set it up so that it does this by default while you’re on the dev branch:
As the error message says: git pull before you try to git push. Apparently your local branch is out of sync with your tracking branch. Depending on project rules and your workflow you might also want to use git pull –rebase.
Setting your branch to exactly match the remote branch can be done in two steps: If you want to save your current branch’s state before doing this (just in case), you can do: Now your work is saved on the branch “my-saved-work” in case you decide you want it back (or want to look at … Read more
Instead of creating a new repository on Github, cloning that, or reinitializing your local repository, the following command would have been sufficient: origin stands for the remote name (default is origin),master is the branch you want to push, in your case it’s master, otherwise you would have to change that in the command.-u means, that your local branch … Read more
You can’t merge with local modifications. Git protects you from losing potentially important changes. You have three options: Commit the change usinggit commit -m “My message” Stash it.Stashing acts as a stack, where you can push changes, and you pop them in reverse order.To stash, typegit stash Do the merge, and then pull the stash:git … Read more
Git 1.7.2 introduced the ability to cherry pick a range of commits. From the release notes: git cherry-pick learned to pick a range of commits (e.g. cherry-pick A..B and cherry-pick –stdin), so did git revert; these do not support the nicer sequencing control rebase [-i] has, though. To cherry-pick all the commits from commit A to commit B (where A is older than B), run: If you want to ignore A itself, … Read more
As the error message says: git pull before you try to git push. Apparently your local branch is out of sync with your tracking branch. Depending on project rules and your workflow you might also want to use git pull –rebase.
EDIT: Since git 2.13, there is a command to save a specific path to the stash: git stash push <path>. For example: OLD ANSWER: You can do that using git stash –patch (or git stash -p) — you’ll enter interactive mode where you’ll be presented with each hunk that was changed. Use n to skip the files that you don’t want to … Read more
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.