A similar alternative is the –strategy-option (short form -X) option, which accepts theirs. For example: git checkout branchA git merge -X theirs branchB However, this is more equivalent to -X ours than -s ours. The key difference being that -X performs a regular recursive merge, resolving any conflicts using the chosen side, whereas -s ours … Read more
Try deleting index.lock file in your .git directory or in one of your worktrees .git/worktrees/*/index.lock if you are in a worktree. 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.
Make sure you’ve checked out the branch you’re replacing (from Zoltán’s comment). Assuming that master is the local branch you’re replacing, and that “origin/master” is the remote branch you want to reset to: git reset –hard origin/master This updates your local HEAD branch to be the same revision as origin/master, and –hard will sync this … Read more
The git submodule update command actually tells Git that you want your submodules to each check out the commit already specified in the index of the superproject. If you want to update your submodules to the latest commit available from their remote, you will need to do this directly in the submodules. So in summary: … Read more
Just git branch without options. From the manpage: With no arguments, existing branches are listed and the current branch will be highlighted with an asterisk.
You are looking for git merge-base. Usage: $ git merge-base branch2 branch3 050dc022f3a65bdc78d97e2b1ac9b595a924c3f2
Rules of thumb Use ~ most of the time — to go back a number of generations, usually what you want Use ^ on merge commits — because they have two or more (immediate) parents Mnemonics: Tilde ~ is almost linear in appearance and wants to go backward in a straight line Caret ^ suggests … Read more
Use the -f option to git tag: -f –force Replace an existing tag with the given name (instead of failing) You probably want to use -f in conjunction with -a to force-create an annotated tag instead of a non-annotated one. Example Delete the tag on any remote before you push git push origin :refs/tags/<tagname> Replace … Read more
You can show changes that have been staged with the –cached flag: $ git diff –cached In more recent versions of git, you can also use the –staged flag (–staged is a synonym for –cached): $ git diff –staged
To search the commit log (across all branches) for the given text: git log –all –grep=’Build 0051′ To search the actual content of commits through a repo’s history, use: git grep ‘Build 0051’ $(git rev-list –all) to show all instances of the given text, the containing file name, and the commit sha1. Finally, as a … Read more