Geek Answers Handbook

Git-threaded and client functionality

How do you recommend managing client-specific features and change requests in Git-flow or Git in general? Should client-specific functions be in a separate branch dedicated to the client? (Each client has its own branch from the development branch.) Or should they be in a separate repository? (Each client has a dedicated repository, the main repository of which is the main repository.)

+5
source share
2 answers

I would create a separate repository for your database and clients. Clients will have a base that will have a remote branch, being your base. When a customer needs a new release, it’s a lot easier. If you put all the clients in one repository, you will have to manually change the integration / developer branch before you start the release of the git version. This will limit your ability to work with multiple versions for different clients.

+2
source

It looks like you have a code base that all clients use, and then you have some “hacks” for specific client functions.

In my opinion, you will have all the "base" code on the main branch. All customers will have a client branch. Be careful and find out where your changes are made.

, , , , .

Rebasing , .

.

Master is at commit 10
 \
   Branch has commits 10, 11, 12, 13, 14, 15 (notice it has commit 10 as well)
|
Master commits 16, 17


When you rebase:
  Master has 10, 16, 17.
  Branch has 10, 16, 17, 11, 12, 13, 14, 15

. Rebase 10, 16 17, 11, 12, 13, 14 15.

, , .

+4

More articles:


All Articles