I was wondering how to pull so of the feature that were added into this fork and base them in the original fork.
I forked bolt into ‘GitHub - Bolt-CE/bolt: Prompt, run, edit, and deploy full-stack web applications ’ and would like to pull the UI Fixs, Docker and button above the code (for saving, etc…).
It is possible to merge two repos to do what you are looking to do!
combining-git-repositories.md
# Combining two git repositories
**Use case**: You have repository A with remote location rA, and repository B (which may or may not have remote location rB). You want to do one of two things:
- preserve all commits of both repositories, but replace everything from A with the contents of B, and use rA as your remote location
- actually combine the two repositories, as if they are two branches that you want to merge, using rA as the remote location
**NB**: Check out `git subtree`/`git submodule` and [this Stack Overflow question](http://stackoverflow.com/questions/1425892/how-do-you-merge-two-git-repositories) before going through the steps below. This gist is just a record of how I solved this problem on my own one day.
Before starting, make sure your local and remote repositories are up-to-date with all changes you need. The following steps use the general idea of changing the remote origin and renaming the local master branch of one of the repos in order to combine the two master branches.show original
Otherwise you could also manually bring your changes into oTToDev worse case scenario, not sure how long that would take.
When creating a pull request in GitHub, you can also change the base repo to point to yours so you are brining in changes from a branch in your repo into the main repo of oTToDev!
@ColeMedin thanks I will try this, if nothing else a good a experiment.
Sounds good Dustin! Fingers crossed, would love to have this work out well