[git-users] Re: merging feature branch into two main branches?

[cdamian]

Seems to  work now. If I always merge the feature branch with --no-
ff. I guess that was why it was working sometimes before, when git
decided not to use fast forward merges.

I have put this into my config now:

[branch master]
mergeoptions = --no-ff

[branch live]
mergeoptions = --no-ff

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

[git-users] Re: merging feature branch into two main branches?

[cdamian]

That doesn't work either. Especially for this case:

git checkout master
git checkout -b feature-x
# 
git commit -am finished feature
git checkout master
git merge feature-x
git checkout feature-x
# 
git commit -am forgot something
git checkout master
git merge feature-x
git checkout live
#
# I really would love to do git merge feature-x

I always end up with changes in live that are not related to the
feature-x

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Re: [git-users] Re: merging feature branch into two main branches?

[Christof Damian]

On Thu, Sep 23, 2010 at 19:41, Adam Prescott mention...@gmail.com wrote:
 I should've tested my own suggestion; I forgot where the refs get sent
 to after the merges.

 In my testing, I did essentially what you typed in your most recent
 post, and then did git checkout master; git merge feature; git
 checkout live; git merge feature.

 This is after the merge into master: http://i.imgur.com/cxBNa.png
 This is after the merge into live: http://i.imgur.com/sad7c.png

 It seems that it's done the merge correctly, to me, and it hasn't
 picked up unrelated commits. Isn't this what you want?

It is exactly what I want. I will have to check again what is going on
with my repository.

Do you have any special options in your git config, maybe about fast
forward merges or so?

Thanks for your help,
Christof

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

[git-users] Re: merging feature branch into two main branches?

[cdamian]

I found one way to do it with cherry-picking:

git checkout master
git checkout -b feature-x
# 
git commit -am finished feature
git checkout master
git cherry-pick feature-x
git checkout live
git cherry-pick feature-x

This seems to work, but is it the correct way to do it? Maybe I should
still use merge to pull it into master and use cherry-pick for
live?

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

[git-users] Re: merging feature branch into two main branches?

[cdamian]

On Sep 17, 6:45 pm, Adam Prescott mention...@gmail.com wrote:
 Could you not do

 git checkout master
 git merge feature-x
 git checkout live
 git merge feature-x^

 ?

 After you merge, the ref feature-x points to the same commit as
 master, whereas what you actually want to merge is the pre-merge
 feature-x, in both situations, if you see what I mean.

Makes sense, I am going to try that too.

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.