Using Git As A Base For Multiple Version Software, But Merging Downstream

I have a software that I want to offer to my clients, but they have the chance to order in changes and personal customization.

Till now I have simply done copies of the original software and done the changes there. But this approach has been a pain, when it comes to maintenance and update of the core files and functions (this is only on the development server, when deployed the “copies” that git makes will be actual copies).

  • Is it possible to rewrite a branch's history without losing merge info along the way?
  • Heroku upload-Precompiling assets failed
  • Is there a git hook which can prevent binary check-ins
  • Git log all, display current commit differently
  • Python wrapper to access Hg, Git and possibly Bazaar repositories?
  • Git directories - how to track directories but not content
  • I have come up with an idea, to use git branches to create those different “copies” and work there. But here is the problem, I want to propagate the changes I do in the master (the base of the software, from which all the branches start) in the branches, not the other way around, from branch to merge in master.

    Is that possible with git? If not, is there any other software that can do that?

  • Is it safe to zipup bare `git` repositories and hand it to other people?
  • Execute hook on fetch into bare repository
  • git diff master..foo gives no output but foo is not merged
  • how to know if you need to git fetch using terminal
  • git clone from linux to a windows with git-upload-pack not found. Msysgit prepend “windows path” to git-upload-pack
  • what git function allows me to approve/deny each change a commit will make?
  • 3 Solutions collect form web for “Using Git As A Base For Multiple Version Software, But Merging Downstream”

    Master is just a branch, like any other. Nothing is stopping you from merging the other way to synchronize any branch with whatever changes has been added to the master branch. When in branch A, just do:

    git merge master
    

    And the merges in master will be added to the A branch. You’ll have to resolve any conflicts like in any other merge.

    Sure, that’s totally possible. To propagate a change from master to another branch, you’d simply do…

    git checkout <another branch>
    git merge master
    

    This takes any new changes from master and adds them to <another branch>, without changing master at all.

    Just make sure that you have the branch you would like to update checked out

    git checkout BRANCHNAME

    than you can do

    git merge master
    

    which ill bring all your changes from master into your current branch, the only problem may be, im not sure if it is possible to do it for more than one branch at a time.

    Git Baby is a git and github fan, let's start git clone.