Re: [git-users] total newbie question

2011-08-03 Thread Konstantin Khomoutov
On Wed, 3 Aug 2011 11:06:11 -0700 (PDT)
Michael Hazen michaelsha...@gmail.com wrote:

 I'm totally new to Git and this may or may not be the place to ask
 such basic questions. Feel free to redirect me if I chose the wrong
 door, as it were.
This list is specifically intended for end-user questions.

[...]
 I then configure that C:\TheProject as a git repository. And then
 create a branch - My CoolNewStuff.
 
 If I make a change in MyCoolNewStuff, and commit it, that change shows
 up as a change in the master branch. And will also show up if I make
 another branch called OtherNeatStuff. This happens no matter what
 branch I am looking at (via checkout and refresh) or when that branch
 was created.
This simply cannot happen.
If you have a branch foo currently checked out, the next commit will
update that branch foo.
Hence see below.

 The other confusion I find is that the latest change is always what
 gets built the compiling. That is - If I add a configuration setting
 to MyCoolNewStuff, it will appear in the build, even if I am intending
 to build the Master or the OtherNeatStuff branch.
 
 So the actual questions are -
 
 How would I build different branches based on one master? (I'm
 assuming some step in branching I'm missing) How do I keep changes
 separate from each branch and not visible until I actually merge?
[...]

I suspect you're using some funky GUI app which can do strange stuff
behind the scenes, or you can have some misconceptions about how it
works.  So the most obvious next step is to get plain msysgit and try
out things as they're described in textbooks, like:

C:\cd temp
C:\tempmkdir foo; cd foo
C:\temp\foogit init .

and so on, creating new branches, checking them out adding files,
inspecting the differences between branches by running
git log master..newbranch
and so on.

Once you're familiar with the concepts, move on to Git-alizing a
real-world project etc.  And only then look at your pet GUI tool.

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



Re: [git-users] total newbie question

2011-08-03 Thread PJ Weisberg
On Wednesday, August 3, 2011, Michael Hazen michaelsha...@gmail.com wrote:
 So impossible or not, What I see is a changed file showing up in the
 master after a commit but not a merge.
 This is especially obvious if a file is added. I may be
 misunderstanding something, however.

How are you creating a new branch?  How do you commit a change to that
branch?

-- 

-PJ

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