On Thu, Apr 15, 2010 at 12:59 AM, Charles Manning
<mannin...@actrix.gen.nz> wrote:
> Hi All
> I have an issue that I think I can resolve in a messy way, but I suspect there
> has to be a cleaner way to do this too.
> On one computer I have master, plus a branch with some work on it. Let's call
> that branch B.
> On a different computer I made a change and pushed that to the shared
> repository.
> Now I want to go back to the first computer, pull the changes so that master
> reflects the current shared repository. That would put master ahead of the
> branch point, but I want to have those changes viewed in branch B too.
> Ideally there would be some way to rip a branch off and re-graft it on to a
> different branch point.
> It seems I could do something like
> -- Starting on branch B --
> git commit -m "B work in progress"
> git checkout master
> git pull
> git branch B-continued
> git checkout B-continued
> git merge B
> git branch -d B
> -- Continue working on B-continued--

If I understand what you are asking I think it's just

- Starting on Branch B
git commit -m'B work in progress'
git checkout master
git pull
git checkout B
git merge master
-- continue working on B

Rick DeNatale

Blog: http://talklikeaduck.denhaven2.com/
Github: http://github.com/rubyredrick
Twitter: @RickDeNatale
WWR: http://www.workingwithrails.com/person/9021-rick-denatale
LinkedIn: http://www.linkedin.com/in/rickdenatale

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 
For more options, visit this group at 

Reply via email to