CODEWITHSUNDEEP
reactjsgitversion-controlarchitecturesingle-page-application
m1k3f
m1k3f

Reputation: 33

What are my options for merging subsets of repositories?

This question is more of an application architecture and source control type of question.

I have 2 Github repositories, one is a React single page application and the other is for a React website. For my single page application, I am making the code publicly available and the application links to its repository. For my website, I want to keep the repository private but incorporate the single page application into it so people can use it without having to download and build code.

Can I get some options on how to merge changes to the single page application repository with the website repository?

So far I am just merging code to the website manually by copying it over and pushing the code, but that is a problematic way of doing things. Neither repo is completely up and running yet, so there is still time for me to make architecture changes. Maybe there are git commands to handle everything?

Any help is appreciated, including suggested architecture/repo changes.

Upvotes: 1

Views: 57

Answers (1)

Cosmin Ioniță
Cosmin Ioniță

Reputation: 4055

I think the best option here would be to use git cherry-pick, but in an automated way:

  • Build a simple script that listens for push events via git webhooks, from your single page repo. That way you can get the merge-in-master event automatically
  • Get the hash of that commit
  • Plug that hash into the git cherry-pick command applied on your private website repo. You can apply this commit on a separate branch in this repo, and merge it in master when you think it's appropriate

Upvotes: 1

Related Questions