[git-users] Fetch changes from parent branch

2012-10-25 Thread Kersten Broich 
Hello git-friends,

I have a question regarding fetching changes from a parent branch.

Imagine the following situation: I have a branch called develop - I 
create a new branch like this:


git checkout -b newbranch


 I do some work there. After some time I switch back to the develop branch:

git checkout develop


No I do some work here and commit. After some time I want to switch back to 
my 'newbranch' idea.

git checkout newbranch


How do I now make sure that I fetch all changes I did in the meantime from 
the parent branch (in this case 'develop')... is it that I have to 

git merge --no-ff develop


or is there a better way?

Thank you very much in advance!
 

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/Y_FTzSWANYgJ.
To post to this group, send email to git-users@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] Fetch changes from parent branch

2012-10-25 Thread Konstantin Khomoutov 
On Thu, 25 Oct 2012 09:47:58 -0700 (PDT)
Kersten Broich kersten.bro...@googlemail.com wrote:

 I have a question regarding fetching changes from a parent branch.
 
 Imagine the following situation: I have a branch called develop - I 
 create a new branch like this:
 
 
 git checkout -b newbranch
 
 
  I do some work there. After some time I switch back to the develop
 branch:
 
 git checkout develop
 
 
 No I do some work here and commit. After some time I want to switch
 back to my 'newbranch' idea.
 
 git checkout newbranch
 
 
 How do I now make sure that I fetch all changes I did in the meantime
 from the parent branch (in this case 'develop')... is it that I have
 to 
 
 git merge --no-ff develop
 
 or is there a better way?

Either merge (but why would you need --no-ff?) or rebase:
$ git checkout newbranch
$ git rebase develop

As usually, [1] is advised to be read, or, better yet, the whole
chapter on branches [2].

1. http://git-scm.com/book/en/Git-Branching-Rebasing
2. http://git-scm.com/book/en/Git-Branching

-- 
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-users@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.