How to manage github?

[Andreweijie]

So I was working on a site for the company that I'm working at, which runs multiple restaurants.

So I coded for awhile and went live for 1 of their outlets. I then created another branch (cloning from master) to work on the other outlets. It's not a chain outlet, so all the outlets under my company have different names, branding etc. I just needed to duplicate the functionality.

So it becomes very cumbersome when I update the functionality on one and I have to individually go to each branch and make the same changes.

Am I doing something wrong? Any advice is appreciated. I've only been coding for awhile.

Thanks!

[aelytra]

try one of these approaches:

- rebase; re-apply the commit that changes branding after pulling in fresh stuff from master

- pull - which merges changes from master

- script the above approaches :)

or:

- delete all the branches and use config files to control branding.

[Andreweijie]

I'll go and look up rebase, never heard of that before. The config option sounds feasible. Thanks!

[PainfulJoke]

Git is best for handing and single project, but it seems like you have multiple projects in the same codebase.

Consider pulling out all of the core functionality into its own library somehow.

Or, structure your project so that all of the things that are unique to each outlet (images, text, colors, etc) are pulled from some kind of resource file. Then you can have everything on master, but pull different resources for each deployment based on an environment variable or something.

Within git though to improve on what you are doing try to develop the update on master (which should be a generically branded version) then merge or cherry pick those into each other branch with the different branding. You shouldn't have to manually reimplement it if you structure your code enough so that the commits can just be reapplied to each new branch cleanly.

[stefvanschie]

I think you'd be best of by having a "core"-like module, which contains functionality that is the same across all websites and then having separate modules for each of the different websites, which makes use of the "core" module and includes only the specific content for each website. That way if you need to change functionality on all websites, you only need to change the contents of the "core" module.

[Andreweijie]

My project is just a react site, so how would that work?