Core features and projects features: GIT Commit issues advices

I'm wondering how to properly manage the seguent situation: I have a GIT repo and the tree structure is something like this

Branch Master contains the core of all projects (project1, project2, ..., projectn). It is a sort of CMS. Branch Develop is a safety copy of branch Master. Each project uses the core contained in the Master branch and adds some other features specialized for that project.

Sometimes happens this: I'm in a project branch (for example Project1), but I modify core features for convenience (features belong to the Core branch). How can I commit those changes in the core branches (Develop and Master) without changing branch and without (consequently) commit all changes done in the Project1 branch? What's the best solution to manage this situation? Thanks in advance.

Answers


you can just go to your maste branch, add and commit the files that you want. then return to project branch and merge it with master. but i think that the structure you have isn't the best idea. i recommend you to use git submodule for your core project and you will be easyaly able to do what you whant. all your projects will easyaly get latest core changes and you do not need to use merges which makes your history much cleaner


Need Your Help

handling google map markers in qTip2

jquery google-maps-api-3 qtip2

I'm trying to create an internal admin interface to quickly add locations to events using qTip and google maps. Here's a simplified fiddle: http://jsfiddle.net/mykel_suthertun/RWtRe/

Something wrong with my barcode (Code 128)

c# .net barcode

It was easy to generate a 3 of 9 barcode using Font()