*can't edit email*
You might also want to start with a fresh clone if the the git pull messed
things up. You can also hard-reset your master back to where it was before
the pull.
Tekkub
Github Tech Support
http://support.github.com/
Join us on IRC: #github on freenode.net
Discussion group: [email protected]
On Wed, Aug 26, 2009 at 6:22 PM, Tekkub <[email protected]> wrote:
> Pull does a fetch (what you wanted) and a merge (what you probably didn't
> want). Try using `git fetch origin` instead. You can run `gitk --all` to
> see where all your branches are at, both local and remote-tracking. If you
> want to work on add_projects on the other computer after the fetch, you can
> create a local branch with `git checkout -b add_projects
> origin/add_projects`
> Try `gitk --all`, it's ugly and can be hard to read for large complicated
> graphs, but it can help you visualize what git is doing with branches.
>
> Tekkub
> Github Tech Support
> http://support.github.com/
> Join us on IRC: #github on freenode.net
> Discussion group: [email protected]
>
>
> On Wed, Aug 26, 2009 at 2:40 PM, Ken <[email protected]> wrote:
>
>>
>> Hi Andrew,
>>
>> Thanks for your response!
>>
>> I tried that but received the following error:
>>
>> fatal: git checkout: updating paths is incompatible with switching
>> branches.
>> Did you intend to checkout 'origin/add_projects' which can not be
>> resolved as commit?
>>
>> Even if it had worked, wouldn't all the add_projects stuff still have
>> been in master?
>>
>> Thanks, Ken
>>
>> On Aug 26, 1:08 pm, Andrew Turner <[email protected]> wrote:
>> > 2009/8/26 Ken <[email protected]>:
>> >
>> >
>> >
>> > > Hello,
>> >
>> > > I have a local git repository with two branches - master and
>> > > add_projects. Periodically I push the changes to github. This all
>> > > works well.
>> >
>> > > Today I decided to sync everything up with another machine. I logged
>> > > into the second machine, which has only one branch (master), and did a
>> > > "git pull origin master". That worked fine. Then I did a "git pull
>> > > origin add_projects" thinking that it would create the add_projects
>> > > branch on the local machine. It didn't. Instead it put all the
>> > > add_projects changes into the master branch. Is there some way I can
>> > > get out of this mess? Also, how should I have done this?
>> >
>> > > I could really use some help!
>> >
>> > > Thanks, Ken
>> >
>> > Try:-
>> >
>> > git checkout -b add_projects origin/add_projects
>> >
>> > Cheers,
>> > Andrew
>> >>
>>
>
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"GitHub" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/github?hl=en
-~----------~----~----~----~------~----~------~--~---
