www.flightgear.ru

alex@alex-pc:$ cd /home/alex/Project-Russia
alex@alex-pc:~/Project-Russia$ git pull -f
remote: Counting objects: 1307, done.
remote: Compressing objects: 100% (687/687), done.
remote: Total 1280 (delta 339), reused 1258 (delta 317)
Receiving objects: 100% (1280/1280), 66.34 MiB | 65 KiB/s, done.
Resolving deltas: 100% (339/339), completed with 11 local objects.
From https://github.com/soitanen/Project-Russia
05fc4d9..1d990e9 master -> origin/master
5830d56..24d113f newmat -> origin/newmat
Updating 05fc4d9..1d990e9
error: Your local changes to the following files would be overwritten by merge:
Objects/e030n50/e030n59/3450224.stg
Please, commit your changes or stash them before you can merge.
Aborting
alex@alex-pc:~/Project-Russia$ git pull -f
Updating 05fc4d9..1d990e9
error: Your local changes to the following files would be overwritten by merge:
Objects/e030n50/e030n59/3450224.stg
Please, commit your changes or stash them before you can merge.
Aborting
alex@alex-pc:~/Project-Russia$ git checkout master
M Airports/U/L/L/ULLI.groundnet.xml
M Airports/U/L/L/ULLI.twr.xml
M Objects/e030n50/e030n59/3450224.stg
M Objects/e030n50/e030n59/pulkovo/1.png
M Objects/e030n50/e030n59/pulkovo/12.png
M Objects/e030n50/e030n59/pulkovo/14.png
M Objects/e030n50/e030n59/pulkovo/2Hmat.png
M Objects/e030n50/e030n59/pulkovo/adds/An-24.0af.png
M Objects/e030n50/e030n59/pulkovo/adds/An-24.1af.png
M Objects/e030n50/e030n59/pulkovo/adds/An-24.2af.png
M Objects/e030n50/e030n59/pulkovo/adds/An-24.3af.ac
M Objects/e030n50/e030n59/pulkovo/adds/An-24.3af.png
M Objects/e030n50/e030n59/pulkovo/adds/An-24.4af.png
M Objects/e030n50/e030n59/pulkovo/adds/An-24.5af.png
M Objects/e030n50/e030n59/pulkovo/adds/An-24.6af.png
M Objects/e030n50/e030n59/pulkovo/adds/An-24.7af.png
M Objects/e030n50/e030n59/pulkovo/adds/An-24.8af.png
M Objects/e030n50/e030n59/pulkovo/adds/An-2_SG_DOSAAF.png
M Objects/e030n50/e030n59/pulkovo/adds/An-74-S-RU.ac
M Objects/e030n50/e030n59/pulkovo/adds/An-74-S-RU_paint.png
M Objects/e030n50/e030n59/pulkovo/adds/An-74-S-RU_paint_LIT.png
M Objects/e030n50/e030n59/pulkovo/adds/Fire-Tch.ac
M Objects/e030n50/e030n59/pulkovo/adds/GRM-GRM.ac
M Objects/e030n50/e030n59/pulkovo/adds/GRM.png
M Objects/e030n50/e030n59/pulkovo/adds/Gazel.png
M Objects/e030n50/e030n59/pulkovo/adds/KRM-KRM.ac
M Objects/e030n50/e030n59/pulkovo/adds/KRM.png
M Objects/e030n50/e030n59/pulkovo/adds/Macht.png
M Objects/e030n50/e030n59/pulkovo/adds/Macht_0050.ac
M Objects/e030n50/e030n59/pulkovo/adds/Macht_0050_2.ac
M Objects/e030n50/e030n59/pulkovo/adds/RedLight.ac
M Objects/e030n50/e030n59/pulkovo/adds/RedLight.png
M Objects/e030n50/e030n59/pulkovo/adds/RedLight.xml
M Objects/e030n50/e030n59/pulkovo/adds/Tch.png
M Objects/e030n50/e030n59/pulkovo/adds/Tch1.png
M Objects/e030n50/e030n59/pulkovo/adds/Tr-Tch1.ac
M Objects/e030n50/e030n59/pulkovo/adds/arp95-box-2.ac
M Objects/e030n50/e030n59/pulkovo/adds/arp95-box-2.xml
M Objects/e030n50/e030n59/pulkovo/adds/arp95-box.ac
M Objects/e030n50/e030n59/pulkovo/adds/arp95-box.xml
M Objects/e030n50/e030n59/pulkovo/adds/arp95-mast.ac
M Objects/e030n50/e030n59/pulkovo/adds/arp95-mast.xml
M Objects/e030n50/e030n59/pulkovo/adds/bagcar3.png
M Objects/e030n50/e030n59/pulkovo/adds/bagcar3_lit.png
M Objects/e030n50/e030n59/pulkovo/adds/bagcar4.ac
M Objects/e030n50/e030n59/pulkovo/adds/bagcar4.xml
M Objects/e030n50/e030n59/pulkovo/adds/bagcar5.ac
M Objects/e030n50/e030n59/pulkovo/adds/bagcar5.xml
M Objects/e030n50/e030n59/pulkovo/adds/bus-3.ac
M Objects/e030n50/e030n59/pulkovo/adds/bus-3.xml
M Objects/e030n50/e030n59/pulkovo/adds/gaz-Gazel_0050.ac
M Objects/e030n50/e030n59/pulkovo/adds/grm-grm.png
M Objects/e030n50/e030n59/pulkovo/adds/grm-grm_lit.png
M Objects/e030n50/e030n59/pulkovo/adds/grm2.png
M Objects/e030n50/e030n59/pulkovo/adds/lira_gvf.ac
M Objects/e030n50/e030n59/pulkovo/adds/lira_gvf.png
M Objects/e030n50/e030n59/pulkovo/adds/lira_gvf.xml
M Objects/e030n50/e030n59/pulkovo/adds/mast.png
M Objects/e030n50/e030n59/pulkovo/adds/mast_lit.png
M Objects/e030n50/e030n59/pulkovo/adds/mi-8-4.png
M Objects/e030n50/e030n59/pulkovo/adds/mi8.ac
M Objects/e030n50/e030n59/pulkovo/adds/palette.png
M Objects/e030n50/e030n59/pulkovo/adds/radaraorl85-2.ac
M Objects/e030n50/e030n59/pulkovo/adds/radaraorl85-2.xml
M Objects/e030n50/e030n59/pulkovo/adds/radaraorl85.png
M Objects/e030n50/e030n59/pulkovo/adds/tanker-2.ac
M Objects/e030n50/e030n59/pulkovo/adds/tanker-2.xml
M Objects/e030n50/e030n59/pulkovo/adds/tech2.png
M Objects/e030n50/e030n59/pulkovo/adds/tech2_lit.png
M Objects/e030n50/e030n59/pulkovo/adds/transparent.png
M Objects/e030n50/e030n59/pulkovo/adds/zil-mil.ac
M Objects/e030n50/e030n59/pulkovo/adds/zil-mil.xml
M Objects/e030n50/e030n59/pulkovo/adds/zil131_d.ac
M Objects/e030n50/e030n59/pulkovo/adds/zil131_d.xml
M Objects/e030n50/e030n59/pulkovo/aeroservice.ac
M Objects/e030n50/e030n59/pulkovo/angar1.png
M Objects/e030n50/e030n59/pulkovo/angar2.png
M Objects/e030n50/e030n59/pulkovo/angar_2.ac
M Objects/e030n50/e030n59/pulkovo/angar_open.ac
M Objects/e030n50/e030n59/pulkovo/aopp.ac
M Objects/e030n50/e030n59/pulkovo/aopp.png
M Objects/e030n50/e030n59/pulkovo/aoppp.png
M Objects/e030n50/e030n59/pulkovo/buk1.ac
M Objects/e030n50/e030n59/pulkovo/buk1.png
M Objects/e030n50/e030n59/pulkovo/buk1.xml
M Objects/e030n50/e030n59/pulkovo/cobus.ac
M Objects/e030n50/e030n59/pulkovo/cobus2700tex.png
M Objects/e030n50/e030n59/pulkovo/domik1.ac
M Objects/e030n50/e030n59/pulkovo/domik2.ac
M Objects/e030n50/e030n59/pulkovo/hz.ac
M Objects/e030n50/e030n59/pulkovo/hz.xml
M Objects/e030n50/e030n59/pulkovo/long.png
M Objects/e030n50/e030n59/pulkovo/long2.png
M Objects/e030n50/e030n59/pulkovo/long4.png
M Objects/e030n50/e030n59/pulkovo/pan.png
M Objects/e030n50/e030n59/pulkovo/prist.ac
M Objects/e030n50/e030n59/pulkovo/pulkovo_2_k.ac
M Objects/e030n50/e030n59/pulkovo/pulkovo_2_k.xml
M Objects/e030n50/e030n59/pulkovo/pulkovo_2_k_simple.xml
M Objects/e030n50/e030n59/pulkovo/pulkovo_2_l.ac
M Objects/e030n50/e030n59/pulkovo/pulkovo_2_l.xml
M Objects/e030n50/e030n59/pulkovo/pulkovo_2_long.ac
M Objects/e030n50/e030n59/pulkovo/pulkovo_2_long.xml
M Objects/e030n50/e030n59/pulkovo/pulkovo_2_long_simple.xml
M Objects/e030n50/e030n59/pulkovo/pulkovo_2_p.ac
M Objects/e030n50/e030n59/pulkovo/pulkovo_2_p.xml
M Objects/e030n50/e030n59/pulkovo/pulkovo_2lr.ac
M Objects/e030n50/e030n59/pulkovo/pulkovo_2lr.xml
M Objects/e030n50/e030n59/pulkovo/pulkovo_2lr_simple.xml
M Objects/e030n50/e030n59/pulkovo/pulkovo_perron.ac
M Objects/e030n50/e030n59/pulkovo/pulkovo_perron.xml
M Objects/e030n50/e030n59/pulkovo/pulkovo_terminal.ac
M Objects/e030n50/e030n59/pulkovo/pulkovo_terminal.xml
M Objects/e030n50/e030n59/pulkovo/pulkovo_tower.xml
M Objects/e030n50/e030n59/pulkovo/rdc.ac
M Objects/e030n50/e030n59/pulkovo/rdc.xml
M Objects/e030n50/e030n59/pulkovo/sams.png
M Objects/e030n50/e030n59/pulkovo/tower1.png
M Objects/e030n50/e030n59/pulkovo/tower2.png
M Objects/e030n50/e030n59/pulkovo/tower_glass.xml
M Objects/e030n50/e030n59/pulkovo/tower_t.png
M Objects/e030n50/e030n59/pulkovo/tu154B-pozh.ac
M Objects/e030n50/e030n59/pulkovo/tu154B.ac
M Objects/e030n50/e030n59/pulkovo/vertical-wall.png
M Objects/e030n50/e030n59/pulkovo/wall.png
M Objects/e030n50/e030n59/pulkovo/zabor.png
M Objects/e040n40/e042n45/urmt/RedLight.ac
M Objects/e040n40/e042n45/urmt/RedLight.png
M Objects/e040n40/e042n45/urmt/RedLight.xml
M Terrain/e030n50/e030n59/3450176.btg.gz
M Terrain/e030n50/e030n59/3450176.stg
M Terrain/e030n50/e030n59/3450177.btg.gz
M Terrain/e030n50/e030n59/3450177.stg
M Terrain/e030n50/e030n59/3450178.btg.gz
M Terrain/e030n50/e030n59/3450178.stg
M Terrain/e030n50/e030n59/3450179.btg.gz
M Terrain/e030n50/e030n59/3450179.stg
M Terrain/e030n50/e030n59/3450184.btg.gz
M Terrain/e030n50/e030n59/3450184.stg
M Terrain/e030n50/e030n59/3450185.btg.gz
M Terrain/e030n50/e030n59/3450185.stg
M Terrain/e030n50/e030n59/3450186.btg.gz
M Terrain/e030n50/e030n59/3450186.stg
M Terrain/e030n50/e030n59/3450187.btg.gz
M Terrain/e030n50/e030n59/3450187.stg
M Terrain/e030n50/e030n59/3450192.btg.gz
M Terrain/e030n50/e030n59/3450192.stg
M Terrain/e030n50/e030n59/3450193.btg.gz
M Terrain/e030n50/e030n59/3450193.stg
M Terrain/e030n50/e030n59/3450194.btg.gz
M Terrain/e030n50/e030n59/3450194.stg
M Terrain/e030n50/e030n59/3450195.btg.gz
M Terrain/e030n50/e030n59/3450195.stg
M Terrain/e030n50/e030n59/3450200.btg.gz
M Terrain/e030n50/e030n59/3450200.stg
M Terrain/e030n50/e030n59/3450201.btg.gz
M Terrain/e030n50/e030n59/3450201.stg
M Terrain/e030n50/e030n59/3450202.btg.gz
M Terrain/e030n50/e030n59/3450202.stg
M Terrain/e030n50/e030n59/3450203.btg.gz
M Terrain/e030n50/e030n59/3450203.stg
M Terrain/e030n50/e030n59/3450208.btg.gz
M Terrain/e030n50/e030n59/3450208.stg
M Terrain/e030n50/e030n59/3450209.btg.gz
M Terrain/e030n50/e030n59/3450209.stg
M Terrain/e030n50/e030n59/3450210.btg.gz
M Terrain/e030n50/e030n59/3450210.stg
M Terrain/e030n50/e030n59/3450211.btg.gz
M Terrain/e030n50/e030n59/3450211.stg
M Terrain/e030n50/e030n59/3450216.btg.gz
M Terrain/e030n50/e030n59/3450216.stg
M Terrain/e030n50/e030n59/3450217.btg.gz
M Terrain/e030n50/e030n59/3450217.stg
M Terrain/e030n50/e030n59/3450218.btg.gz
M Terrain/e030n50/e030n59/3450218.stg
M Terrain/e030n50/e030n59/3450219.btg.gz
M Terrain/e030n50/e030n59/3450219.stg
M Terrain/e030n50/e030n59/3450224.btg.gz
M Terrain/e030n50/e030n59/3450224.stg
M Terrain/e030n50/e030n59/3450225.btg.gz
M Terrain/e030n50/e030n59/3450225.stg
M Terrain/e030n50/e030n59/3450226.btg.gz
M Terrain/e030n50/e030n59/3450226.stg
M Terrain/e030n50/e030n59/3450227.btg.gz
M Terrain/e030n50/e030n59/3450227.stg
M Terrain/e030n50/e030n59/3450232.btg.gz
M Terrain/e030n50/e030n59/3450232.stg
M Terrain/e030n50/e030n59/3450233.btg.gz
M Terrain/e030n50/e030n59/3450233.stg
M Terrain/e030n50/e030n59/3450234.btg.gz
M Terrain/e030n50/e030n59/3450234.stg
M Terrain/e030n50/e030n59/3450235.btg.gz
M Terrain/e030n50/e030n59/3450235.stg
M Terrain/e030n50/e030n59/ULLI.btg.gz
M Terrain/e030n50/e030n59/ULLP.btg.gz
M Terrain/e030n50/e030n59/ULSK.btg.gz
M Terrain/e030n50/e030n59/ULSM.btg.gz
M Terrain/e030n50/e030n59/XLLE.btg.gz
D aeronav/fgdata/Navaids/awy.dat.gz
D aeronav/fgdata/Navaids/fix.dat.gz
D aeronav/fgdata/Navaids/nav.dat.gz
Already on 'master'
Your branch is behind 'origin/master' by 3 commits, and can be fast-forwarded.
alex@alex-pc:~/Project-Russia$ git pull -f
Updating 05fc4d9..1d990e9
error: Your local changes to the following files would be overwritten by merge:
Objects/e030n50/e030n59/3450224.stg
Please, commit your changes or stash them before you can merge.
Aborting
alex@alex-pc:~/Project-Russia$

error: Your local changes to the following files would be overwritten by merge:
Objects/e030n50/e030n59/3450224.stg

По веткам:
git checkout branch_name - это как раз команда переключения веток. master - Сочи будет со старыми текстурами, Питер будет без домиков. newmat - Сочи с новыми текстурами и текстурированными дорогами (обязательно использование кастомных материалов), в Питере будут домики из ОСМ.