Talk:FlightGear Git: data developers: Difference between revisions
Jump to navigation
Jump to search
Hamzaalloush (talk | contribs) m (sorry for lots of small edits :() |
(→Suggested Upstream section: Approve proposal) |
||
Line 18: | Line 18: | ||
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) | ||
: Sounds good - I'll make sure to include it in the Git article refactoring I'm currently doing. -- [[User:Elgaton|ElGaton]] ([[User talk:Elgaton|<tt>talk</tt> to me]]) 16:09, 6 May 2016 (EDT) |
Revision as of 20:09, 6 May 2016
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/next
what do you think? -Hamzaalloush (talk) 16:13, 24 March 2015 (EDT)
- Sounds good - I'll make sure to include it in the Git article refactoring I'm currently doing. -- ElGaton (talk to me) 16:09, 6 May 2016 (EDT)