FGDATA next with submodules

[legoboyvdlp]

Did I ruin my FGDATA with submodules?

Code: Select all

C:\Users\Redpath\Documents\GitHub\MY_FGDATA>git pull
warning: Cannot merge binary files: AI/Aircraft/747/Textures/VirginAtlantic/744-
tex.png (HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/United/744-tex.png
(HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/Thai/744-tex.png (H
EAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/Qantas/744-tex.png
(HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/Malaysia/744-tex.pn
g (HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/Lufthansa/744-tex.p
ng (HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/Korean/744-tex.png
(HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/KLM/744-tex.png (HE
AD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/Garuda/744-tex.png
(HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/EvaAir/744-tex.png
(HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/Delta/744-tex.png (
HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/Default/744-tex.png
 (HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/ChinaAirlines/744-t
ex.png (HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/CathayPacific/744-t
ex.png (HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/BritishAirways/744-
tex.png (HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
warning: Cannot merge binary files: AI/Aircraft/747/Textures/AirChina/744-tex.pn
g (HEAD vs. 0d2e476291e4b714f1533b5dea6e3b256460752e)
Auto-merging AI/Aircraft/747/Textures/VirginAtlantic/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/VirginAtlantic/74
4-tex.png
Auto-merging AI/Aircraft/747/Textures/United/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/United/744-tex.pn
g
Auto-merging AI/Aircraft/747/Textures/Thai/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/Thai/744-tex.png
Auto-merging AI/Aircraft/747/Textures/Qantas/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/Qantas/744-tex.pn
g
Auto-merging AI/Aircraft/747/Textures/Malaysia/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/Malaysia/744-tex.
png
Auto-merging AI/Aircraft/747/Textures/Lufthansa/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/Lufthansa/744-tex
.png
Auto-merging AI/Aircraft/747/Textures/Korean/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/Korean/744-tex.pn
g
Auto-merging AI/Aircraft/747/Textures/KLM/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/KLM/744-tex.png
Auto-merging AI/Aircraft/747/Textures/Garuda/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/Garuda/744-tex.pn
g
Auto-merging AI/Aircraft/747/Textures/EvaAir/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/EvaAir/744-tex.pn
g
Auto-merging AI/Aircraft/747/Textures/Delta/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/Delta/744-tex.png

Auto-merging AI/Aircraft/747/Textures/Default/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/Default/744-tex.p
ng
Auto-merging AI/Aircraft/747/Textures/ChinaAirlines/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/ChinaAirlines/744
-tex.png
Auto-merging AI/Aircraft/747/Textures/CathayPacific/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/CathayPacific/744
-tex.png
Auto-merging AI/Aircraft/747/Textures/BritishAirways/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/BritishAirways/74
4-tex.png
Auto-merging AI/Aircraft/747/Textures/AirChina/744-tex.png
CONFLICT (add/add): Merge conflict in AI/Aircraft/747/Textures/AirChina/744-tex.
png


[IAHM-COL]

Short answer
yes

Long answer
Can fix

[IAHM-COL]

Warning. you will loose local modifications.

Code: Select all

git reset --hard d68108
git pull


It will set you back to the beginning of 2016.1 and pull gets you back to today

[legoboyvdlp]

Sure -- I don't have any modifications apart from Bombable which I don't use.

[legoboyvdlp]

Mayday, mayday -- code does not work --
git reset --hard version/2016.1.0 works

[legoboyvdlp]

Head now 9ef830c, confirm latest?

[IAHM-COL]

thats good. If the code you send did the job, pull may just get you up to speed.

[IAHM-COL]

https://sourceforge.net/p/fgdata/submodules/ci/next/tree/
Last is 9ef8 -- confirmed.

[legoboyvdlp]

Git status -- result clean, just need to do that gui/menubar.xml hack and I am good. Hack is to fix a bug where the Debug menu closes because my screen is too small.

[IAHM-COL]

ok