Re: [git-users] newbie: Merging from remote projects into my modified branch

2012-08-17 Thread tigerfoot 
That did the trick, thanks!  Bookmarked for future reference.

On Friday, August 17, 2012 2:59:18 PM UTC-5, Adam Prescott wrote:
>
> GitHub covers this in their "Fork A Repo" help page: 
> https://help.github.com/articles/fork-a-repo
>
> See the section, "Pull in upstream changes".
>
> Adam
>

-- 
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/-/hu-N1TmeCW4J.
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] newbie: Merging from remote projects into my modified branch

2012-08-17 Thread Adam Prescott 
GitHub covers this in their "Fork A Repo" help page:
https://help.github.com/articles/fork-a-repo

See the section, "Pull in upstream changes".

Adam

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

[git-users] newbie: Merging from remote projects into my modified branch

2012-08-17 Thread tigerfoot 
Hello,

I cloned a project someone else wrote (say github://author/foo) into my own 
repo and made several changes and have pushed them back to my own repo 
(github://me/foo).

I left the project alone for a while but now see the original author has 
made a lot of changes in his code, github://author/foo.  How can I merge 
his changes into my github://me/foo repo?

Thanks for any help.
-tf

-- 
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/-/oUf01PCa5CMJ.
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.