git merge followed by another git merge?
I have an awkward git merge scenario where I am not sure what is the best way forward. Any help would be greatly appreciated. Our development branch has multiple contributors and hence is a hosted git repository. So there are three trees: upstream(say upX), development branch(say devX) & my local git tree for development branch (say local_devX)
As a developer working on devX, I periodically merge changes from upX (aka upstream). Recently the following happened:
I merge upstream changes (from upX --> local_devX) and resolve all conflicts. Here is how the trees looked at that point
| | |
devX: --L--M--D'--N--O |
I begin testing the G' merge which takes about a week (due to bug fixes). Now in the mean time both upstream and local_devX branches have moved forward and I need to resync local_devX branch to accommodate for those changes.
Here is where I am right now:
| | |
I can always blow away my local_devX branch and checkout a fresh copy of devX & do the merge again. But then i will be redoing my merge commit G' all over again.
What would be the best way to achieve the following without having to redo G' work?
| | |
devX: --L--M--D'--N--O---P--Q |
I guess i can do two more merges one for devX changes(P&Q) and the second for upX changes (H&K, since G has already been merge in my local). But I am not sure if this will mess up things like having an unreadable history.
This question already has an answer here: Ramifications of forgetting slash in “git merge origin/branch” 1 answer Note the lack of a / in the command. I am a git novice. I am working on the
What's the difference between 'git pull' and 'git fetch'? The question above's top answer says In the simplest terms, git pull does a git fetch followed by git merge or git rebase. I understand th
I'm relatively new to programming, I've been working with ruby on rails because I'm interested in web development so I figured it was a good thing to start with. I've been using git to keep the versio
I have a git branch called 9-sign-in-out with the perfectly working code that I would like to become the master I'm currently on the master branch. $ git branch 9-sign-in-out * master I'm trying to
experts on stackoverflow.. I'm new on git, develop C# project with small team. assuming the project need contribution from freelancer, i lock important part of my code by create the DLL, and create a
Having no remote repository, just one local repository with two branches. $ git branch -a master * devel Are following commands in this context the same/synonym? $ git pull . master and $ git merge
What do the file status mean in git merge commits? Such as MM, MA, AM? One can see them using git log --merges --name-status -c One of the commits is like: commit 6be3b2d7d24e0ca90260d422b5e7777
develop branch --> dashboard (working branch) I use git merge --no-ff develop to merge any upstream changes into dashboard git log: commit 88113a64a21bf8a51409ee2a1321442fd08db705 Merge: 981bc20 88
I've successfully set up Kaleidoscope as my default git difftool, and works like a charm. But when I make a fetch then git difftool, I can see what has changed, yet I cannot choose or merge what I wan
Everybody understands something different by merge git repositories, so here is my case. We had a TFS repository and we have checked out the sources at one point in time and made an initial git comm
we are using git on a lan of computers and we have a central repository on one machine, every developer has to clone the repository and work on his one machine. but how to merge all this repositories
I need to merge two Git repositories into a branch new, third repository. I've found many descriptions of how to do this using a subtree merge (for example Jakub Narębski's answer on How do you merge
git log reveals the following: commit 1abcd[...] Author: [...] Date: [...] [Useful commit] commit 2abcd[...] Author: [...] Date: [...] Merge branch [...] of [etc. etc.] commit 3abcd[...] Author: [...]
I'm trying to understand ... What's the difference between git merge and git rebase?
I've been doing some reading on how both the git merge and git rebase operations work, and I think I have a very basic understanding of the differences. I've seen the diagrams :-) Despite that, I'm st
Let's assume I merge git and there is a merge conflict. My question is: how can I force git to always choose the newer version of code in conflict so I won't need to resolve the conflict by hand?
I used to work with 3-way merge tools like BC3, SourceGear, or P4 which usually show 4 components: base, left, right, and merged result. What Git seems to do, and rightly so especially in cases of a g
I have two files A and B in master. I created a branch feature where I modified both A and B. Then, someone else deleted B and renamed A to B in master (using git mv). When I merge feature into master
Which is a recommended method when bringing aosp ics branch into master(my project main branch), git merge or git rebase? (By the way I read git rebase vs git merge, but still confused which is the pr
I'm trying to merge a git branch (test-development) back into master. There are lots of merge conflicts but I want as many as possible to be resolved via --theirs. Is there a way to tell git to merge
I've been using git for a while, and I understand why merge conflicts happen and that I need to make the final decision between two conflicting blocks of code. However, I want to find a way to fix mer
How do I force my changes when merging in git? Someone put all bin directories in git and now I have a terrible merge conflict :( Now it says the following: When you have resolved this problem run
I have a master branch and development branches per ticket. What is the correct way to merge dev branch to master, Merge updates from master to dev, resolve conflicts, merge dev to master OR Merge dev
I have mainProject on git, with a shared library. This shared library is also in subProject. my workflow I start my project by cloning the project and create a branch : git clone https://github.com/us
My git repo looks like this: _ branch_a / master / \_ branch_b Now I want to merge branch_b into branch_a, not either branch into master. So, I did git checkout branch_a git merge branch_b And git
When I resolve a conflict, I have a merge commit in addition to the real commit I've made. It looks as following: Merge branch 'master' of http://myDomain.com/git/SIMULATOR What is the best way to
I am using git extensions to merge by branches. However, I see same branch listed multiple times with different paths. I know that they refer to the same thing but why are they listed multiple times ?
I get stumped when git diff other_branch shows differences and git merge other_branch does nothing. What's the right way to incorporate that missing code into my_branch? This SO answer diagramed a s
Another question said git pull is like a git fetch + git merge. But what is the difference between git pull VS git fetch + git rebase?
I'm testing the use of git-subtree to merge a library repo into a bigger project. It seems great in principle. Sometimes when I do a git subtree pull I get merge conflicts like this: <<<<
We've done something bad. We ran git stash save during a merge conflict, and now we can't restore our work. Things we've tried: git pull -Xours origin master git stash apply --index And: git pull or
Coming from an svn background, I had this question: http://stackoverflow.com/questions/1138990/git-equivalent-of-svn-status-u (what is the git equivalent of svn status -u) And I understand, you do: gi
i want to have no other branch history commit when i merge other branch to master. how can i do it ? as we know: git pull --rebase origin test # mean: only history commit no merge commit. git pull --n
Is there any way to write a custom merge conflict resolver in git? We are having evil merge conflicts resulting from changing java import statements on multiple branches. These seem like they would be
I have two branches with the exact same file (incase you are wondering it is a .sql file) and I want to interactively merge it. Pretty much I want to open up a diff program like I do when there is a c
I'm pretty new to git so I'm still getting my bearings with the tool. I have a small problem involving a merge. Basically the timeline is as follows: Did a rebase from SVN using git-svn bridge Had
I have don a git svn rebase and I got a conflict. I want to use git-merge-file to merge the two versions of the file by choosing the version on the server. git-merge-file has this option called --thei
I want to merge my branch 'S' to another branch 'T', but there's a file in my branch that I want to be excluded from the merge for my own reasons, and I want the history of my changes on that file to
I have branches v1.0 v1.1 v1.2 v1.3 v1.4 [master] now i checkout the v1.0 and add some directory with files (db tables, stored procedures, etc) how to merge the newly added directory with files in a
Every time I do a merge I need for a merge commit to be generated and I would like it to have more than just the summary of all the commits. My question is how can I format git-fmt-merge-msg or what d
I'll try to illustrate my problem by the following example: I have linux kernel git repository containing 2.6.31-6 version with some modifications. I'd like to merge it with, say, 2.6.32. But during g
I want to take advantage of the git-merge algorithm on two arbitrary files in a git repo. Here is my working directory: folder/ file1 file2 file1 and file2 are similar, but I want to see how git woul
I have had a look at git rebase vs git merge But I'd like to be sure about which solution to choose in this case : I want to implement a new feature on Master so i branch it to a new Feature branch. I
I have tried get the change of github repository to one repository bazaar, something like this: bzr merge firstname.lastname@example.org:Author/repository.git is there any way to do this?
Let's assume you are merging one branch in Git to another one(no fast forward of course). And you don't have conflicts, so the merge should be successful, without interruptions. But by some reasons yo
git checkout develop > Switched to branch develop git merge --no-ff master > Already up-to-date git checkout master > Switched to branch master git merge --no-ff develop > Already up-t
I have a branch master and a branch feature which was checked out from master. master gets commits pushed into it from other developers and I regularly merge master back into feature, so that it keeps
How do I merge this branch to master? thufir@dur:~/NetBeansProjects$ thufir@dur:~/NetBeansProjects$ git clone -b 4.GUI_loading_messages_slowly email@example.com:THUFIR/USENET.git Cloning into USENET... r
can't find for a long period of time how to add this option in tortoisegit What is the difference between `git merge` and `git merge --no-ff`? can anyone explain how do i set it?
I want to merge a branch into another branch selectively & then merge another branch ignoring 1 branch in between. How do I do this with Git? I am using Git Extensions for visual studio.