tagged [git-merge]
Undo git pull, how to bring repos to old state
Undo git pull, how to bring repos to old state Is there any way to revert or undo git pull so that my source/repos will come to old state that was before doing git pull ? I want to do this because it ...
- Modified
- 5 Dec at 17:42
Choose Git merge strategy for specific files ("ours", "mine", "theirs")
Choose Git merge strategy for specific files ("ours", "mine", "theirs") I am in the middle of rebasing after a `git pull --rebase`. I have a few files that have merge conflicts. How can I accept "thei...
- Modified
- 2 Aug at 00:24
Git Cherry-pick vs Merge Workflow
Git Cherry-pick vs Merge Workflow Assuming I am the maintainer of a repo, and I want to pull in changes from a contributor, there are a few possible workflows: 1. I cherry-pick each commit from the re...
- Modified
- 6 Aug at 21:50
Rebasing a Git merge commit
Rebasing a Git merge commit Take the following case: I have some work in a topic branch and now I'm ready to merge back to master: I perform the merge from master, resolve the conflicts and now I have...
- Modified
- 7 Sep at 14:4
How do you rebase the current branch's changes on top of changes being merged in?
How do you rebase the current branch's changes on top of changes being merged in? Okay. If I'm on a branch (say `working`), and I want to merge in the changes from another branch (say `master`), then ...
- Modified
- 4 Sep at 04:14
error: Your local changes to the following files would be overwritten by checkout
error: Your local changes to the following files would be overwritten by checkout [this one](https://stackoverflow.com/questions/14318234/how-to-ignore-error-on-git-pull-about-my-local-changes-would-b...
- Modified
- 29 Aug at 15:41
What is the precise meaning of "ours" and "theirs" in git?
What is the precise meaning of "ours" and "theirs" in git? This might sound like too basic of a question, but I have searched for answers and I am more confused now than before. What does "ours" and "...
How can I selectively merge or pick changes from another branch in Git?
How can I selectively merge or pick changes from another branch in Git? I'm using Git on a new project that has two parallel -- but currently experimental -- development branches: - `master`- `exp1`- ...
- Modified
- 23 Jun at 21:13
Git merge hotfix branch into feature branch
Git merge hotfix branch into feature branch Let’s say we have the following situation in Git: 1. A created repository: mkdir GitTest2 cd GitTest2 git init 2. Some modifications in the master take plac...
- Modified
- 15 Apr at 07:41
Simple tool to 'accept theirs' or 'accept mine' on a whole file using git
Simple tool to 'accept theirs' or 'accept mine' on a whole file using git I don't want a visual merge tool, and I also don't want to have to vi the conflicted file and manually choose the between HEAD...
How to keep a branch synchronized/updated with master?
How to keep a branch synchronized/updated with master? At the moment git is doing my head in, I cannot come up with the best solution for the following. There are two branches, one called and one call...
- Modified
- 9 Apr at 00:28
Git workflow and rebase vs merge questions
Git workflow and rebase vs merge questions I've been using Git now for a couple of months on a project with one other developer. I have several years of experience with [SVN](http://en.wikipedia.org/w...
- Modified
- 3 Oct at 16:10