Question

I’ve created a repository for a site i’ve been working on lately. Now i’m going to be duplicating the site, thus my thinking is i’ll create a new branch in Git, that way I can deal with changes to that tool in particular, separately. But also merge in important changes back to the main branch.

The only thing that worries me is, say 50% of the changes need to be pushed back to the core and 50% need to be kept on this branch.

Can anyone suggest how this could be managed, as I’m unsure of whether or not you can only push back to the core branch specific changes to the secondary branch.

Hopefully you follow what i’m saying?

If not, ask for clarity.

Answer 1

This should be no problem at all. Lets assume you have repo A (the first repo) with a master branch (or perhaps you want to name it core). Lets assume that A is also a bare repo (so you can push up changes to it).

Just clone A into a new repo B:

git clone A B
cd B
git checkout -b B-stuff

Add stuff to B-stuff branch as you see fit. When you notice you have a change that should be in core, just check out the master branch, commit there and push:

git checkout master
.. changes
git commit -am 'foo'
git push origin master