Databases
StackOverflow2013
Postsdbo
POHow to merge upstream changes into my mirrored internal server
Body
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POHow to merge upstream changes into my mirrored internal server
    text
    copied!<p>I'm new to git/repo, so forgive me if this is a simple question. I followed the steps below to mirror Android source on my server: </p> <ol> <li><p>repo init -u <a href="https://android.googlesource.com/platform/manifest" rel="nofollow">https://android.googlesource.com/platform/manifest</a> --mirror </p></li> <li><p>Cloned platform/manifest.git and modifed default.xml to fetch from my server </p></li> <li><p>On a desktop ran the comands below to sync the ICS branch with my server, created work branch and pushed to reposity on my server: </p> <p>repo init -u git://192.168.1.125/ics-mirror/platform/manifest.git -b android-4.0.1_r1 repo sync </p> <p>repo start work_branch --all </p> <p>repo forall -c 'git remote add corpserver /opt/git/ics-mirror/$REPO_PROJECT.git $@' </p> <p>repo forall -c git push corpserver work_branch:refs/heads/work_branch<br> repo sync </p></li> <li><p>Changed default revision to work_branch </p> <p>default revision="refs/heads/work_branch" </p></li> </ol> <p>So we can now sync our work_branch on desktops by running this command: </p> <p>repo init -u git://192.168.1.125/ics-mirror/platform/manifest.git -b work_branch </p> <p>However I just don't know how to merge upstream changes made on the branch android-4.0.1_r1 into our work_branch. A git branch -a lists the following branches: </p> <p>remotes/aosp/donut-release </p> <p>remotes/aosp/donut-release2 </p> <p>remotes/aosp/eclair-passion-release </p> <p>remotes/aosp/eclair-release </p> <p>remotes/aosp/eclair-sholes-release </p> <p>remotes/aosp/eclair-sholes-release2 </p> <p>remotes/aosp/froyo </p> <p>remotes/aosp/froyo-release </p> <p>remotes/aosp/gingerbread </p> <p>remotes/aosp/gingerbread-mr4-release </p> <p>remotes/aosp/gingerbread-release </p> <p>remotes/aosp/ics-factoryrom-2-release </p> <p>remotes/aosp/ics-mr0 </p> <p>remotes/aosp/master </p> <p>remotes/aosp/work_branch </p> <p>remotes/m/work_branch -> aosp/work_branch </p> <p>Could anyone please kindly help with this? </p> <p>Thanks! </p>
 

Querying!

 
Guidance
An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload