public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: hs_glw <greg@hra•net>
To: git@vger•kernel.org
Subject: Big Mess--How to use Git to resolve
Date: Sat, 17 Dec 2011 04:32:10 -0800 (PST)	[thread overview]
Message-ID: <1324125130643-7103964.post@n2.nabble.com> (raw)

I want to use Git, I have had read documentation installed on my local
machine, then looked at my mess of code and don't know what the hell to do.

I have a Perl Web Application, several hundred programs, templates,
configuration files.

Companies buy my application and I host it for them.

I have 40+ clients

Each client has its own unique installation of the software on my web
server.

Some clients have customizations of the code, some have version 5 of the
software others have 5.2, 5.5 etc.

This sucks.

My goal is to pull all the different versions in, put them all together, and
create a master version of the software that runs for all clients.

There will still be some files that are completely unique to each client
(style sheets and logos for instance).

I can't figure out if I should start with my oldest version of the code or
the newest, I haven't really found in the documentation how to start with
different permutations of the code in a repository.   Everything I have
found assumes you start with one set of code, then make changes.  I have
multiple variations and need to get them consistent.

I expect to use all of 2012 getting this put back together, but I have to
start.  Does anyone have any suggestions on how I should set Git up to do
what I need?

--
View this message in context: http://git.661346.n2.nabble.com/Big-Mess-How-to-use-Git-to-resolve-tp7103964p7103964.html
Sent from the git mailing list archive at Nabble.com.

next             reply	other threads:[~2011-12-17 12:32 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-17 12:32 hs_glw [this message]
2011-12-17 15:33 ` Big Mess--How to use Git to resolve Randal L. Schwartz
2011-12-17 18:40   ` hs_glw
2011-12-19 17:04     ` Holger Hellmuth
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=1324125130643-7103964.post@n2.nabble.com \
    --to=greg@hra$(echo .)net \
    --cc=git@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox