FGDATA next with submodules

User avatar
legoboyvdlp
Posts: 1757
Joined: Mon Sep 14, 2015 9:49 pm
Location: Venezuela

Re: FGDATA next with submodules

Postby legoboyvdlp » Mon May 02, 2016 4:07 pm

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
~~Legoboyvdlp~~
Maiquetia / Venezuela Custom Scenery
Hallo! Ich bin Jonathan.
Hey!
Avatar created by InSapphoWeTrust CC BY-SA 2.0, https://commons.wikimedia.org/w/index.p ... d=27409879

User avatar
IAHM-COL
Posts: 6452
Joined: Sat Sep 12, 2015 3:43 pm
Location: Homey, NV (KXTA) - U.S.A
Contact:

Re: FGDATA next with submodules

Postby IAHM-COL » Mon May 02, 2016 4:09 pm

Short answer
yes

Long answer
Can fix
https://raw.githubusercontent.com/IAHM-COL/gpg-pubkey/master/pubkey.asc

R.M.S.
If we gave everybody in the World free software today, but we failed to teach them about the four freedoms, five years from now, would they still have it?

User avatar
IAHM-COL
Posts: 6452
Joined: Sat Sep 12, 2015 3:43 pm
Location: Homey, NV (KXTA) - U.S.A
Contact:

Re: FGDATA next with submodules

Postby IAHM-COL » Mon May 02, 2016 4:12 pm

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
https://raw.githubusercontent.com/IAHM-COL/gpg-pubkey/master/pubkey.asc

R.M.S.
If we gave everybody in the World free software today, but we failed to teach them about the four freedoms, five years from now, would they still have it?

User avatar
legoboyvdlp
Posts: 1757
Joined: Mon Sep 14, 2015 9:49 pm
Location: Venezuela

Re: FGDATA next with submodules

Postby legoboyvdlp » Mon May 02, 2016 7:53 pm

Sure -- I don't have any modifications apart from Bombable which I don't use.
~~Legoboyvdlp~~
Maiquetia / Venezuela Custom Scenery
Hallo! Ich bin Jonathan.
Hey!
Avatar created by InSapphoWeTrust CC BY-SA 2.0, https://commons.wikimedia.org/w/index.p ... d=27409879

User avatar
legoboyvdlp
Posts: 1757
Joined: Mon Sep 14, 2015 9:49 pm
Location: Venezuela

Re: FGDATA next with submodules

Postby legoboyvdlp » Mon May 02, 2016 8:09 pm

Mayday, mayday -- code does not work --
git reset --hard version/2016.1.0 works
~~Legoboyvdlp~~
Maiquetia / Venezuela Custom Scenery
Hallo! Ich bin Jonathan.
Hey!
Avatar created by InSapphoWeTrust CC BY-SA 2.0, https://commons.wikimedia.org/w/index.p ... d=27409879

User avatar
legoboyvdlp
Posts: 1757
Joined: Mon Sep 14, 2015 9:49 pm
Location: Venezuela

Re: FGDATA next with submodules

Postby legoboyvdlp » Mon May 02, 2016 8:11 pm

Head now 9ef830c, confirm latest?
~~Legoboyvdlp~~
Maiquetia / Venezuela Custom Scenery
Hallo! Ich bin Jonathan.
Hey!
Avatar created by InSapphoWeTrust CC BY-SA 2.0, https://commons.wikimedia.org/w/index.p ... d=27409879

User avatar
IAHM-COL
Posts: 6452
Joined: Sat Sep 12, 2015 3:43 pm
Location: Homey, NV (KXTA) - U.S.A
Contact:

Re: FGDATA next with submodules

Postby IAHM-COL » Mon May 02, 2016 8:11 pm

thats good. If the code you send did the job, pull may just get you up to speed.
https://raw.githubusercontent.com/IAHM-COL/gpg-pubkey/master/pubkey.asc

R.M.S.
If we gave everybody in the World free software today, but we failed to teach them about the four freedoms, five years from now, would they still have it?

User avatar
IAHM-COL
Posts: 6452
Joined: Sat Sep 12, 2015 3:43 pm
Location: Homey, NV (KXTA) - U.S.A
Contact:

Re: FGDATA next with submodules

Postby IAHM-COL » Mon May 02, 2016 8:12 pm

https://raw.githubusercontent.com/IAHM-COL/gpg-pubkey/master/pubkey.asc

R.M.S.
If we gave everybody in the World free software today, but we failed to teach them about the four freedoms, five years from now, would they still have it?

User avatar
legoboyvdlp
Posts: 1757
Joined: Mon Sep 14, 2015 9:49 pm
Location: Venezuela

Re: FGDATA next with submodules

Postby legoboyvdlp » Mon May 02, 2016 8:42 pm

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.
~~Legoboyvdlp~~
Maiquetia / Venezuela Custom Scenery
Hallo! Ich bin Jonathan.
Hey!
Avatar created by InSapphoWeTrust CC BY-SA 2.0, https://commons.wikimedia.org/w/index.p ... d=27409879

User avatar
IAHM-COL
Posts: 6452
Joined: Sat Sep 12, 2015 3:43 pm
Location: Homey, NV (KXTA) - U.S.A
Contact:

Re: FGDATA next with submodules

Postby IAHM-COL » Mon May 02, 2016 8:44 pm

ok
https://raw.githubusercontent.com/IAHM-COL/gpg-pubkey/master/pubkey.asc

R.M.S.
If we gave everybody in the World free software today, but we failed to teach them about the four freedoms, five years from now, would they still have it?


Return to “FGMEMBERS”

Who is online

Users browsing this forum: No registered users and 13 guests