On Wed, 10 Jun 2015 09:29:04 -0700 (PDT)
David VanKirk <krik...@gmail.com> wrote:
> That being said, I'm not sure the best practice for getting our
> existing code into Git. We currently have a Test server and
> Production server, so we have two copies of the code and the
> developers access the code directly on the Test server and make
> changes there. Because of this, we have code files on the Test
> server that I want in the repository, but in most cases I do not want
> these files to ever make it to the Production server. So on to my
> actual question, how can add ALL the code on the Test server to the
> repository, but only have a subset of that code identified to deploy
> to the Live server?
> I've thought about making the Test code the master branch and
> creating a "production" branch where the Production code subset would
> live, but when i think through the process of merging master changes
> into the production branch it would see that, without a ton of
> effort, the "test-only" files would come along for the merge, which
> is not desired.
What do you mean by «"test-only" files»?
Here's why I'm asking: A complicated project usually undergoes certain
code churn which produces a number of commits, each or which is
"imperfect" in the sense the state of the project at it can't yet be
sensibly used in production. At some point, the code base stabilizes
and the process resolves in a commit which can be deemed as fit for
production usage. (More complicated project might involve several
stages for this, like forking a stabilization branch at some point and
only allowing bugfixes on it, and hence the production version is cut
from that branch.) The key point here is that "imperfect" history
leads to a "perfect" commit. And so here's my question: do you refer
to the contents of the commits from such "development" history as "test
files"? Or do you wanted to tell that developers create on the test
server some files which exist on the filesystem only during development
and must not exist on the filesystem on the production server?
That's a crucial difference, and hence I'd like to see some
clarification before we move forward.
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
For more options, visit https://groups.google.com/d/optout.