Home/ Questions/Q 578661
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-13T14:17:04+00:00

We have project (PHP application), but instalation for each client vary, sometimes very little,

  • 0

We have project (PHP application), but instalation for each client vary, sometimes very little, sometimes more. Still, big part of source code is common. We manage specific installations as parallel branches to master branch and we need to transfer changes from master to other branches. Same situation was solved in Git: how maintain (mostly) parallel branches with only a few difference? The most voted solution was to transfer changes between braches this way:

git pull
git checkout local
git rebase master

As mentioned in the solution it creates non-fast-forward pushes after rebasing which I find very unpleasant complication. My QUESTION is – why not to do instead:

git pull
git checkout local
git merge master
Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    It really depends on what you want to do with the branch. Yes, if you rebase local, it’ll create non-fast-forward pushes after rebasing. On the other hand, you’ll be maintaining a set of distinct changes going forward and what’s on your branch will be a set of changes AS IF THEY HAD BEEN MADE TO THE NEWEST HEAD OF MASTER.

    Merging the master to local, instead, will keep local marching forward in time with master, and will record the history as it happened. If you need to be able to reconstruct the state of local in the past, then you’ll want to do this. The history will never change. But, you’ll have a more complicated history to deal with.

    • 0