Updated Updating an imported repository via git commands (markdown)

Luke Usher 2018-04-12 13:09:28 +01:00
parent 0adf1be224
commit 258e41708e
2 changed files with 11 additions and 13 deletions

@ -0,0 +1,11 @@
For Cxbx-Reloaded, we maintain our own forks of sub-moduled libraries. This allows us to integrate them nicely into our build process, while also providing the ability to easily synchronize upstream changes.
## Updating the Submodule Repository
From the sub-module directory (import/*)
```
git remote add upstream <upstream url>
git fetch upstream && git merge upstream/master
git push
```
At this point, our sub-module fork is synchronized with the latest upstream changes, but we still need to tell the Cxbx-Reloaded repository to use the new commits, to do this, use any git client of choice (or the command line) to stage the sub-module's directory, and commit/push as normal.

@ -1,13 +0,0 @@
Luke summarized it to this :
> git remote add upstream https://github.com/crosire/d3d8to9
> git fetch upstream
> git rebase upstream/master
> git push -f
> Now our own submodule fork is updated to upstream with our own cxbx-r changes
> then in the Cxbx-Reloaded root
> git add import/d3d8to9
> then git commit and git push as normal