From: Holger Hellmuth <hellmuth@ira.uka.de>
To: hs_glw <greg@hra.net>
Cc: git@vger.kernel.org
Subject: Re: Big Mess--How to use Git to resolve
Date: Mon, 19 Dec 2011 18:04:24 +0100 [thread overview]
Message-ID: <4EEF6E98.7080000@ira.uka.de> (raw)
In-Reply-To: <1324147247781-7104493.post@n2.nabble.com>
On 17.12.2011 19:40, hs_glw wrote:
> Randal, thank you for the comprehensive answer. I have one follow-up: we
> have the working files, then in our installation files we have .PL files
> that are worked on by some iteration of "make" to insert paths both into
> .cgi files and config files, should these installation files be setup as a
> branch? or is there a more correct way of implementing this?
If I understand you correctly the working aka source files are patched
in place to adapt to a customer. I would suggest changing that a bit so
that the source filename is different from the installation filename.
Add the source file into the repo and add the installation filenames
into .gitignore
That way you don't have generated files in the repository. Which is
usually avoided because they easily get out of sync with their source.
The renaming should be done so you never erraneously add installation
files into the repository in place of the source files
next prev parent reply other threads:[~2011-12-19 17:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-17 12:32 Big Mess--How to use Git to resolve hs_glw
2011-12-17 15:33 ` Randal L. Schwartz
2011-12-17 18:40 ` hs_glw
2011-12-19 17:04 ` Holger Hellmuth [this message]
2011-12-21 23:06 ` Neal Kreitzinger
2011-12-21 23:44 ` Neal Kreitzinger
2011-12-21 23:56 ` Seth Robertson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4EEF6E98.7080000@ira.uka.de \
--to=hellmuth@ira.uka.de \
--cc=git@vger.kernel.org \
--cc=greg@hra.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).