[git-users] Git pull shows merge conflicts, git mergetool shows none

2010-08-16 Thread jog 
Hi
Can someone explain how a 'git pull' can result in an auto-merge
conflict, thus be left with a manual merge to be done, 'git status'
showing 'unmerged' files as a result and still have 'git mergetool'
show 'No files to be merged' ?
That's the second time I encounter this - sometimes git-mergetool
works, sometimes it just reports nothing to be merged, and I don't
understand why.
Thanks

-- 
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] Checking out a branch

2010-08-16 Thread David Doria 
First, I clone my github repo:

git clone g...@github.com:daviddoria/daviddoria-vtk.git

Then I want to work on a particular branch (there are several - you
can see them here: http://github.com/daviddoria/daviddoria-vtk)

If I 'git branch -a' I see:

[dor...@doriadjec VTK-GraphIterators]$ git branch -a
  VTK-daviddoria
  remotes/origin/HEAD - origin/VTK-daviddoria
  remotes/origin/VTK-AllProjects
  remotes/origin/VTK-GraphConversions
etc

Then if I

git checkout remotes/origin/VTK-GraphConversions

it says that I am on a detached HEAD

If I instead do

git checkout -b VTK-GraphConversions remotes/origin/VTK-
GraphConversions

It seems like it creates a NEW branch because I get


$ git branch -a
* VTK-GraphConversions
  VTK-daviddoria
  remotes/origin/VTK-GraphConversions

How should I begin working on a branch after I clone the repo?

Thanks!

David

-- 
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] Checking out a branch

2010-08-16 Thread Michael P. Soulier 
David Doria wrote:

 git checkout remotes/origin/VTK-GraphConversions

Don't check out remote branches, create your own based on them.

git checkout -b VTK-GraphConversions origin/VTK-GraphConversions

Mike



signature.asc
Description: OpenPGP digital signature