Talk:FlightGear Git: data developers: Difference between revisions
Jump to navigation
Jump to search
Hamzaalloush (talk | contribs) (Suggested Upstream section) |
Hamzaalloush (talk | contribs) |
||
Line 1: | Line 1: | ||
== Suggested Upstream section== | == Suggested Upstream section== | ||
As i found out | As i found out after i followed these well-written instruction, if i had to sync my repositories "next" to absolve conflicts and allow fast forwarding for the devs to merge easily. | ||
I found a way that you can add a new remote to pull from and sync your next to. | I found a way that you can add a new remote to pull from and sync your next to. |
Revision as of 20:17, 24 March 2015
Suggested Upstream section
As i found out after i followed these well-written instruction, if i had to sync my repositories "next" to absolve conflicts and allow fast forwarding for the devs to merge easily.
I found a way that you can add a new remote to pull from and sync your next to.
git remote add upstream git://git.code.sf.net/p/flightgear/fgdata
check out to next and create your feature branch, i.e:
git checkout next
git checkout -b reflect-shader
fetch and merge the "upstream" remote into your feature branch:
git fetch upstream
git merge upstream/master
what do you think? -Hamzaalloush (talk) 16:13, 24 March 2015 (EDT)