I took code from an open source repo (openRepo) on github using the import repo tool. This imported the code to my private repo called RepoA and included all branches and tags. I want to do two things:
Problem 1: I want repoA to be updated by fresh code from openRepo. All new branches and tags should also be updated.
So i linked repoA to openRepo:
git remote add public https://github.com/openRepo/A.git
git pull public master
git push origin master
This works but it only updates the master branch. It does not pick up new branches.
Problem 2: I wanted to make custom changes to RepoA, so I picked the latest_stable_branch from RepoA and made a new branch called devbranch in RepoA. I then added some code to it. At this moment, devbranch in RepoA is ahead of latest_stable_branch in RepoA and OpenRepo (since both are the same).
The problem is when OpenRepo releases another stable branch, I want that code plus the code from my devbranch. And i dont know how to do this.