Talk:FlightGear Git: data developers: Difference between revisions
Jump to navigation
Jump to search
Hamzaalloush (talk | contribs) |
Hamzaalloush (talk | contribs) |
||
Line 15: | Line 15: | ||
<code>git fetch upstream</code> | <code>git fetch upstream</code> | ||
<code>git merge upstream/ | <code>git merge upstream/reflect-shader</code> | ||
what do you think? -[[User:Hamzaalloush|Hamzaalloush]] ([[User talk:Hamzaalloush|talk]]) 16:13, 24 March 2015 (EDT) | what do you think? -[[User:Hamzaalloush|Hamzaalloush]] ([[User talk:Hamzaalloush|talk]]) 16:13, 24 March 2015 (EDT) |
Revision as of 06:09, 25 March 2015
Suggested Upstream section
As i found out after i followed these well-written instruction, if i had to sync from the project's "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 feature branch to. while preserving your "next" state.
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/reflect-shader
what do you think? -Hamzaalloush (talk) 16:13, 24 March 2015 (EDT)