Hi fellow wiki editors!

To help newly registered users get more familiar with the wiki (and maybe older users too) there is now a {{Welcome to the wiki}} template. Have a look at it and feel free to add it to new users discussion pages (and perhaps your own).

I have tried to keep the template short, but meaningful. /Johan G

Talk:FlightGear Git: data developers

From FlightGear wiki
Revision as of 15:13, 24 March 2015 by Hamzaalloush (Talk | contribs) (Suggested Upstream section)

(diff) ← Older revision | Latest revision (diff) | Newer revision → (diff)
Jump to: navigation, search

Suggested Upstream section

As i found out when i followed these well-written instruction, if i had to sync my repository to final FGData to absolve conflicts in files modified 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)