From: hs_glw Date: Sat, 17 Dec 2011 18:40:47 GMT Subject: Re: Big Mess--How to use Git to resolve Message-ID: <1324147247781-7104493.post@n2.nabble.com> In-Reply-To: <86iplf2oy5.fsf@red.stonehenge.com> 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? -- View this message in context: http://git.661346.n2.nabble.com/Big-Mess-How-to-use-Git-to-resolve-tp7103964p7104493.html Sent from the git mailing list archive at Nabble.com.