I want to use Git to manage a C++ project. I have a branch in which I 
develop a specific class, and I have several version of its header and 
source files. Each such version is slightly different and I work with them 
together. For example, one of the files is a header file with all methods 
commented, and I remove the // from lines as I work. Another one is a 
version of my class, which is a class template. It's like a sandbox where I 
try things while it develop that class. So I have 2 questions:

Do all these versions belong to the Git repository, including the one with 
comments I mark? Or it's a document which should be in my project's 
document folder, outside the repo?
And if I do have all versions in the repo, how do I make sure that when I 
merge the branch with the trunk, only the "real" class files are merged and 
all my sandbox templates are not added to the trunk? Will merging 
automatically add them all to the trunk? And in general, if I check out, 
delete a file and commit - will the file be considered "deleted" from the 
new revision, or it just stays there from the previous revision?

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to