Re: Big Mess--How to use Git to resolve

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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


--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]