git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Managing several threads of the same project in GIT

From
Ppggrd <git@paggard.com>
Date
Dec 26, 2008, 11:20 UTC
Message-ID
<loom.20081226T110416-269@post.gmane.org>
Hello,

I've been studying GIT for some time already, but still have not figured out if it can be used for the scenario like this:

for example:

I have a project, which divides to threads aiming to different clients most of the code in the project is shared between the threads in certain files there are different code parts to meet client requirements but even those files share the rest of the code

What I need to be able to do is:
- to get code for any thread I like at any time
- to be able to develop each thread separately
- to be able to merge certain changes from one thread to another, at the same
time without loosing the changes specific to the thread, and keep track of merge
history

With GIT strategy to treat content as a single unity - if you will try to merge branches - everything will be merged thus overwriting the changes that need to stay. But in the example above, if I make a change in the shared code in one thread, I need to be able to populate this change to all the threads, but this change only.

so - is this possible in GIT and if yes - what kind of strategy should be used?
thanks 
Next: Santi Béjar
Message 1 of 3 in “Managing several threads of the same project in GIT”
  1. pggrdDec 26, 2008
  2. Santi BéjarDec 26, 2008
  3. Sitaram ChamartyDec 26, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.