How to work with more than one version of the same application at the same time in git?

Davi Bogo

I have an application that is going to be used for a lot of clients, currently we have two versions of it, one is the core version, the other will be used by one of my client. For now we have two branches (master, client_1) and they're similar, but different.

My problem is that if I correct something just for client_1, it's easy, I just have to commit in that branch. But if I correct something for both, I don't now how to "merge" it, because if I merge my git tries to merge everything, not just my correction.

Now, imagine that my application expands to 15 clients, each one has something different, small changes, but it's different. How do I control this kind of problems?

eftshift0

I think what you are looking for is "cherry-pick". That small change, you commit it on the main branch... then on the client branch, you cherry-pick the revision.

Collected from the Internet

Please contact [email protected] to delete if infringement.

edited at2020-12-11

Comments

0 comments

TOP Ranking

Article

How to work with more than one version of the same application at the same time in git?

How to work with more than one version of the same application at the same time in git?

pump.io port in URL

How to import an asset in swift using Bundle.main.path() in a react-native native module

Failed to listen on localhost:8000 (reason: Cannot assign requested address)

Double spacing in rmarkdown pdf

SQL Server : need add a dot before two last character

C++ 16 bit grayscale gradient image from 2D array

JMeter: Why get error when try to save test plan

JWT gives JsonWebTokenError "invalid token"

How to make thrown errors visible outside of a Promise?

How to tell if iOS Today Widget is being updated in the background?

Calling Doctrine clear() with an argument is deprecated

Capybara Selenium Chrome opens About Google Chrome

How to update azerothcore-wotlk docker container

Adding Ripple Effect to RecyclerView item

mysql.connector.errors.InterfaceError: 2003: Can't connect to MySQL server on '127.0.0.1:3306' (111 Connection refused)

Error while applying filter on dataframe - PySpark

Unable to add slack to bluemix project

MyPy fails dataclass argument with optional list of objects type

How can I validate and parse phone numbers to extract their country calling code and area code?

Single Sign-On in Spring by using SAML Extension and Shibboleth

python how to create many-to-many of lists inside one list