Multi Git Repo's with same files -

first of all, there chance brain fried , not thinking clearly... not sure how explain :(

my repo setup

i have 2 repositories, framework, , client1.

the first 1 has files, including modified in client repo. these considered placeholders, or example files.

the second repository, client1, contains added files don't belong framework, modifying of files framework repo.

the client1 repo starts off pulling framework repo in, add/edit files fit clients website. when framework repo files changed, merge them client1 repo.

this end causing conflicts. there chance there many conflicts.

can git pull , accept files conflicts, in 1 command? make things faster.

or there anyway better?

edit: have changed our framework core files not touched client. instead put files in folder if need override framework file.

for example: client needs modify contact page controller located in /framework/application/controller/contact/index.php. client creates file in /application/controller/contact/index.php override 1 in framework.

we have start use git-flow.

from can understand based on have said, framework repo template pull dev repo actively use development. issue have when make changes framework, , want apply changes active dev environment(client1) have built on , maybe modified framework pulled in before.

i not tell of specific command ensure no conflicts, pass on bit of knowledge on ways may made better.

firstly, think framework should more or less stays same, shouldn't technically modifying in client often, being said, think may re-inventing wheel in areas. in truth, frameworks exist want, , appears generating ready go dev environment can modify , redeploy without worrying conflicts , disasters.

there tool have started study, know enough think answer needs well. tool vagrant, vagrant tool centered around configuring , setting dev environment plugins , structure want, , importantly, 1 of merits ease in changing structure (or "framework") , running command destroy , redeploy environment. best part, dev environment set in config file, can reused anywhere. pretty nice!

additionally, take @ grunt, grunt tool allows setup tasks , handle manual processes in dev environment. (it lots of stuff including js minification , linting, less compilation, running console commands), can configure tasks , chain them create nice efficient workflow, worth checking out.

finally, take @ git principle known git flow, sort of paradigm meant give solid, professional repository structure , deployment process. may overkill needs, 1 of biggest things promotes use of dev, test , production environment. here a great link outlines well, go depth on these subjects, tools have mentioned have great docs , explain things far better can.

it worth spend lot of time setting environment tailor needs, may seem waste, know me jump in , start getting hands dirty, built , managed environment save lots of time in long run.

anyway, luck!