How does Git manage multiple versions horizontally?

problem description

now there is such a requirement:
there is a software, there are several versions of this software, and there is little difference between these versions.
that is, most of the code in these versions is the same, and a small part of the code in
is different.

the point is:
has a problem with the public parts of these programs.
can I have a way to modify
only once, and
to make all versions change
but keep the original version different?

the platform version of the problem and what methods you have tried

(1) extraction of common parts is a big problem.

finally, I found that my needs are a little contradictory, but I still want to discuss it with you.

Thank you

Github git
Apr.05,2021

in the title, you said that it is difficult to extract the public part. It is estimated that the public part may have been changed in all projects, and the changes are unknown. The only feasible way in the short term is to use git cherry-pick to merge the changes into each branch and resolve the conflict manually.

in the long run, Feng_Yu has come up with the best theoretical solution to extract the public parts into a separate project. Then all other projects refer to this project in the form of SubModule (submodules).

git submodule

my less formal method is a quick way to cut the mess. For example, there are three versions of A B C

.
  1. choose any version, such as A, and pull three branches from A, A'B'C'
    2. .
  2. other (BMague C) compare with this A, package all the difference files of BMague C (archive + diff command)
  3. overwrite the difference files to B'C' and commit once
  4. Test whether the B'C' branch is normal,
  5. pull a branch from A base.

the public part will be changed to base , and the difference part will be changed to A'B'C'
attached: course with difference package

doesn't see a specific problem, but it seems that one core branch + several branches rebase is also feasible.

Previous: Height and width of svg g label

Next: How do you do the dynamic effect of the Mijia purifier page?

css mysql arrays josn react html typescript webpack npm sass R objective-c .net sql-server jquery python-3.x angularjs django angular excel regex iphone ajax linux xml pandas vba spring database wordpress string wpf xcode windows bash postgresql oracle multithreading eclipse list firebase algorithm macos forms image scala visual-studio azure bootstrap spring-boot react-native python-2.7 docker performance function winforms matlab powershell apache dataframe api sqlite numpy rest shell selenium flutter dart maven loops qt swing android-studio csv express file class tensorflow sorting codeigniter perl
© 2021 CodesHelper
Advertising Contact us About us
Menu