[SOLVED] GIT

[IAHM-COL]

it looks good until here:

Code: Select all

it0uchpods@Main-PC MINGW64 ~/727-230 (master)
$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)

modified: Models/Flightdeck/Dashboard/HSI/hsi (copy).xml
modified: Models/Flightdeck/Dashboard/HSI/hsi1.xml
new file: Models/Flightdeck/Dashboard/HSIOLD/hsi (copy).xml
new file: Models/Flightdeck/Dashboard/HSIOLD/hsi-more.png
new file: Models/Flightdeck/Dashboard/HSIOLD/hsi.ac
new file: Models/Flightdeck/Dashboard/HSIOLD/hsi.png
new file: Models/Flightdeck/Dashboard/HSIOLD/hsi1.xml
new file: Models/Flightdeck/Dashboard/HSIOLD/shadow.png
new file: Systems/instrumentation.xml
modified: Systems/steering.xml


All those files are properly staged now. and you did not have the Warning about LR anymore. so that's great.

You are trying to push without commit

So you go

Code: Select all

git commit -m "message"


first.

After that, you should have comitted

Code: Select all

git status


To verify that you have extra commits locally

Code: Select all

git log


to see details on the commit

Code: Select all

git push origin master


to actually push

[Octal450]

Never mind! I got it all to work. I have pushed my update to GIT now.

[IAHM-COL]

Good Job getting your first commit pushed into the remote.
I marked this as SOLVED.

A few remarks.

1. Keep new commits with improvements coming
2. the email you used in the command

Code: Select all

git config --global user.email "your_email@example.com"


Did not coincide with the correct email address you registered to github. Thus, Github is not assigning the commit correctly to you.
Repeat the command correctly so the next commits you make are properly authored.

3. Later, I will show you how to make a pull request to the other person repository (ie, IAHM-COL's 727-230) as the method to request your changes to come into the development repository

[legoboyvdlp]

Hi Israel or anyone
Now, you don't say anything, but I feel sure you are tired of being a 'personal git tech support'.
I've done all I can.

Now, know this for a fact: I don't touch SpaceShuttle sacred development.

I am on master branch, by the way.

Code: Select all

        new file:   Models/PayloadBay/rms_lightmap.png
        renamed:    Models/EMU/spstob_2.png -> Models/PayloadBay/spstob_2.png
        new file:   Models/RHC-Commander.ac
        new file:   Models/RHC-cmdr.xml
        modified:   Models/SpaceShuttle.xml
        modified:   Models/TailCone.ac
        new file:   Models/TailCone.xml
        modified:   Models/cockpit.ac
        modified:   Models/cockpit.xml
        modified:   Models/external-fuel-tank.xml
        modified:   Models/external-tank-disconnected.xml
        new file:   Models/fwd-cockpit-base.png
        new file:   Models/fwd-cockpit-text-map-x.png
        deleted:    Models/fwd-cockpit-text-map.png
        new file:   Models/shuttle_lightmap.png
        modified:   Models/shuttle_o2.ac
        modified:   Models/srb-left.xml
        modified:   Models/srb-right.xml
        new file:   Nasal/HUD/HUD.svg
        new file:   Nasal/HUD/HUD_main.nas
        modified:   Nasal/PFD/PFD.svg
        modified:   Nasal/PFD/PFD_main.nas
        new file:   Nasal/TAEM_guidance.nas
        new file:   Nasal/coordinates.nas
        new file:   Nasal/cws.nas
        modified:   Nasal/dialogs.nas
        new file:   Nasal/dps_command_parser.nas
        modified:   Nasal/entry_guidance.nas
        modified:   Nasal/failures.nas
        modified:   Nasal/housekeeping.nas
        new file:   Nasal/launchpad.nas
        modified:   Nasal/limits.nas
        modified:   Nasal/map.nas
        new file:   Nasal/orbital_planning.nas
        new file:   Nasal/payload.nas
        modified:   Nasal/rel_orbital.nas
        modified:   Nasal/stages.nas
        modified:   Nasal/thermal_balance.nas
        new file:   Nasal/vertical_traj.nas
        modified:   SpaceShuttle-TAEM-set.xml
        new file:   SpaceShuttle-TAEM-splash.png
        modified:   SpaceShuttle-approach-set.xml
        new file:   SpaceShuttle-approach-splash.png
        modified:   SpaceShuttle-entry-set.xml
        new file:   SpaceShuttle-entry-splash.png
        modified:   SpaceShuttle-glide-set.xml
        new file:   SpaceShuttle-glide-splash.png
        modified:   SpaceShuttle-launch-set.xml
        new file:   SpaceShuttle-launch-splash.png
        modified:   SpaceShuttle-orbit-set.xml
        new file:   SpaceShuttle-orbit-splash.png
        renamed:    shuttle_Earthview.png -> SpaceShuttle-splash.png
        modified:   Systems/apu_hydraulics.xml
        modified:   Systems/autopilot.xml
        modified:   Systems/computations.xml
        modified:   Systems/electrical_power.xml
        modified:   Systems/failures.xml
        modified:   Systems/flight-recorder/components/effects.xml
        new file:   Systems/light.xml
        modified:   Systems/mechanical.xml
        new file:   Systems/navigation.xml
        modified:   Systems/oms_hardware.xml
        modified:   Systems/orbital_parameters.xml
        new file:   Systems/pointing.xml
        modified:   Systems/rcs_control.xml
        modified:   Systems/rcs_hardware.xml
        new file:   Systems/rms.xml
        modified:   Systems/ssme-flame-computation.xml
        new file:   Systems/throttle.xml
        modified:   Systems/thrust_vectoring.xml
        modified:   shuttle.xml

Unmerged paths:
  (use "git add <file>..." to mark resolution)

        both modified:   Models/LandingGears.ac
        both modified:   Models/damage.ac
        both modified:   SpaceShuttle-checklists.xml
        both modified:   SpaceShuttle-set.xml


C:\Users\Redpath\Documents\GitHub\MY_FGDATA\Aircraft\SpaceShuttle>git pull
A       Data/README.data
A       Data/entry01.dat
A       Data/entry02.dat
A       Data/launch01.dat
A       Data/launch02.dat
A       Dialogs/dps_keyboard.xml
M       Dialogs/entry_guidance.xml
A       Dialogs/flight_controls.xml
M       Dialogs/mechanical.xml
M       Dialogs/options.xml
A       Dialogs/payload_retention.xml
A       Dialogs/pb_floodlight.xml
A       Dialogs/rms_deploy.xml
A       Dialogs/rms_operation.xml
A       Dialogs/rms_pyro.xml
A       Documentation/Howto.AddPayload.txt
A       Documentation/dps_dictionary.pdf
M       Engines/OMS.xml
M       Huds/Instruments/ladder.xml
M       Huds/Instruments/turn-bank-indicator.xml
M       Huds/Sets/controls.xml
M       Huds/Sets/gps.xml
M       Huds/Sets/parameters.xml
A       Models/Artwork/!model-image-source-links.txt
A       Models/Artwork/LC-39-MLP.blend
M       Models/Artwork/LandingGears.blend
A       Models/Artwork/OMSPods.blend
A       Models/Artwork/SPARTAN-201/Preview.png
A       Models/Artwork/SPARTAN-201/Readme.txt
A       Models/Artwork/SPARTAN-201/SPARTAN-201.ac
A       Models/Artwork/SPARTAN-201/SPARTAN-201.blend
A       Models/Artwork/cockpit-ste5.blend
M       Models/Artwork/cockpit-step3-uv-layout-y.png
D       Models/Artwork/cockpit-step3.blend
M       Models/Artwork/damage.blend
A       Models/Artwork/fwd-cockpit-base.xcf
M       Models/Artwork/fwd-cockpit-text-map.xcf
A       Models/Artwork/panel-MEDS-lhs-label.xcf
A       Models/Artwork/panel-ac-volt-rhs-f.xcf
A       Models/Artwork/panel-adi.xcf
A       Models/Artwork/panel-adp.xcf
A       Models/Artwork/panel-command-side-console.xcf
A       Models/Artwork/panel-dps-entry.xcf
A       Models/Artwork/panel-gauge-ac-volts.xcf
A       Models/Artwork/panel-gauge-dc-amps.xcf
A       Models/Artwork/panel-gauge-dc-volts.xcf
A       Models/Artwork/panel-idp-2.xcf
A       Models/Artwork/panel-idp.xcf
A       Models/Artwork/panel-joystick-screw.xcf
A       Models/Artwork/panel-l1-rear.xcf
A       Models/Artwork/panel-l1-smoke-lights.xcf
A       Models/Artwork/panel-l1.xcf
A       Models/Artwork/panel-l2.xcf
A       Models/Artwork/panel-landing-gear.xcf
A       Models/Artwork/panel-ldg-gear.xcf
A       Models/Artwork/panel-power-distribution.xcf
A       Models/Artwork/panel-r1-2-powerxcf.xcf
A       Models/Artwork/panel-timer.xcf
A       Models/Artwork/rmsArm.blend
M       Models/Artwork/shuttle_o2.blend
A       Models/Artwork/tranbg.png
D       Models/EMU/robotarm.ac
D       Models/EMU/robotarm.xml
D       Models/EMU/spstob_2.png
D       Models/EMU/submodels.xml
A       Models/Effects/ET_explosion_blast.xml
A       Models/Effects/ET_fireball.xml
M       Models/Effects/SRB_launch_smoke.xml
M       Models/Effects/SRB_smoke.xml
A       Models/Effects/debris_trail_1.xml
A       Models/Effects/debris_trail_2.xml
A       Models/Effects/debris_trail_3.xml
A       Models/Effects/debris_trail_4.xml
A       Models/Effects/debris_trail_5.xml
M       Models/Effects/entry_flame.xml
A       Models/Effects/entry_flame_core.xml
A       Models/Effects/entry_flame_medium.xml
A       Models/Effects/entry_flame_small.xml
A       Models/Effects/ground/gear-damage/spark.png
A       Models/Effects/ground/gear-damage/tyresmoke.png
D       Models/Effects/ground/smoke.png
D       Models/Effects/ground/spark.png
D       Models/Effects/ground/spray.png
M       Models/Effects/ground/tailstrike/left-tail-strike.xml
M       Models/Effects/ground/tailstrike/right-tail-strike.xml
A       Models/Effects/ground/tailstrike/spark.png
M       Models/Effects/ground/tailstrike/tail-strike.xml
A       Models/Effects/ground/tailstrike/tyresmoke.png
A       Models/Effects/ground/tiresmoke/tyresmoke.png
M       Models/Effects/ground/tirespray/left-tire-spray.xml
M       Models/Effects/ground/tirespray/nose-tire-spray.xml
M       Models/Effects/ground/tirespray/right-tire-spray.xml
A       Models/Effects/ground/tirespray/smoke.png
M       Models/Effects/ground/touchdown/left-touchdown-smoke.xml
M       Models/Effects/ground/touchdown/nose-touchdown-smoke.xml
M       Models/Effects/ground/touchdown/right-touchdown-smoke.xml
A       Models/Effects/ground/touchdown/tyresmoke.png
D       Models/Effects/ground/tyreburn.png
D       Models/Effects/ground/tyresmoke.png
M       Models/Effects/ground/wingstrike/left-wing-strike.xml
M       Models/Effects/ground/wingstrike/right-wing-strike.xml
A       Models/Effects/ground/wingstrike/spark.png
A       Models/Effects/ground/wingstrike/tyresmoke.png
A       Models/Effects/plasma_trail.xml
A       Models/Effects/shuttle-payload-bay-door-left.eff
A       Models/Effects/shuttle-payload-bay-door-right.eff
A       Models/Effects/shuttle-payload-bay.eff
A       Models/Effects/shuttle-rms.eff
A       Models/Effects/shuttle_tail.eff
U       Models/LandingGears.ac
A       Models/Launchpad/LC-39-MLP.ac
A       Models/Launchpad/launchpad.xml
M       Models/OMSPods.ac
M       Models/OMSPods.xml
A       Models/PayloadBay/Antenna-ku-Assembly.ac
A       Models/PayloadBay/Antenna-ku-Assembly.xml
A       Models/PayloadBay/Pallet.ac
A       Models/PayloadBay/Spartan-201/SPARTAN-201-disconnected.xml
A       Models/PayloadBay/Spartan-201/SPARTAN-201-secure.xml
A       Models/PayloadBay/Spartan-201/SPARTAN-201.ac
A       Models/PayloadBay/Spartan-201/SPARTAN-201.xml
A       Models/PayloadBay/TDRS/TDRS.xml
A       Models/PayloadBay/TDRS/TDRS_demo.ac
A       Models/PayloadBay/TDRS/TDRS_disconnected.xml
A       Models/PayloadBay/TDRS/TDRS_secure.xml
A       Models/PayloadBay/TDRS/foil_n.png
A       Models/PayloadBay/TDRS/tex_01.png
A       Models/PayloadBay/TDRS/tex_02.png
A       Models/PayloadBay/airlock_module.xml
A       Models/PayloadBay/ku-antenna-disconnected.xml
A       Models/PayloadBay/pallet.xml
A       Models/PayloadBay/rmsArm-disconnected.xml
A       Models/PayloadBay/rmsArm.ac
A       Models/PayloadBay/rmsArm.xml
A       Models/PayloadBay/rms_lightmap.png
A       Models/PayloadBay/spstob_2.png
A       Models/RHC-Commander.ac
A       Models/RHC-cmdr.xml
M       Models/SpaceShuttle.xml
M       Models/TailCone.ac
A       Models/TailCone.xml
M       Models/cockpit.ac
M       Models/cockpit.xml
U       Models/damage.ac
M       Models/external-fuel-tank.xml
M       Models/external-tank-disconnected.xml
A       Models/fwd-cockpit-base.png
A       Models/fwd-cockpit-text-map-x.png
D       Models/fwd-cockpit-text-map.png
A       Models/shuttle_lightmap.png
M       Models/shuttle_o2.ac
M       Models/srb-left.xml
M       Models/srb-right.xml
A       Nasal/HUD/HUD.svg
A       Nasal/HUD/HUD_main.nas
M       Nasal/PFD/PFD.svg
M       Nasal/PFD/PFD_main.nas
A       Nasal/TAEM_guidance.nas
A       Nasal/coordinates.nas
A       Nasal/cws.nas
M       Nasal/dialogs.nas
A       Nasal/dps_command_parser.nas
M       Nasal/entry_guidance.nas
M       Nasal/failures.nas
M       Nasal/housekeeping.nas
A       Nasal/launchpad.nas
M       Nasal/limits.nas
M       Nasal/map.nas
A       Nasal/orbital_planning.nas
A       Nasal/payload.nas
M       Nasal/rel_orbital.nas
M       Nasal/stages.nas
M       Nasal/thermal_balance.nas
A       Nasal/vertical_traj.nas
M       SpaceShuttle-TAEM-set.xml
A       SpaceShuttle-TAEM-splash.png
M       SpaceShuttle-approach-set.xml
A       SpaceShuttle-approach-splash.png
U       SpaceShuttle-checklists.xml
M       SpaceShuttle-entry-set.xml
A       SpaceShuttle-entry-splash.png
M       SpaceShuttle-glide-set.xml
A       SpaceShuttle-glide-splash.png
M       SpaceShuttle-launch-set.xml
A       SpaceShuttle-launch-splash.png
M       SpaceShuttle-orbit-set.xml
A       SpaceShuttle-orbit-splash.png
U       SpaceShuttle-set.xml
A       SpaceShuttle-splash.png
M       Systems/apu_hydraulics.xml
M       Systems/autopilot.xml
M       Systems/computations.xml
M       Systems/electrical_power.xml
M       Systems/failures.xml
M       Systems/flight-recorder/components/effects.xml
A       Systems/light.xml
M       Systems/mechanical.xml
A       Systems/navigation.xml
M       Systems/oms_hardware.xml
M       Systems/orbital_parameters.xml
A       Systems/pointing.xml
M       Systems/rcs_control.xml
M       Systems/rcs_hardware.xml
A       Systems/rms.xml
M       Systems/ssme-flame-computation.xml
A       Systems/throttle.xml
M       Systems/thrust_vectoring.xml
M       shuttle.xml
D       shuttle_Earthview.png
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.


All that at the top is my git status, then trying a git pull.

I never touched one file.

What is wrong?!

I did deinit and reinit, for an initial error. But now...

[jwocky]

Problem is, I am not as fit in git as Israel is. Since it is all Space Shuttle there seem to be two ways. You can try to deinit and reinit. If that doesn't work, and you are sure, you didn't change anything in the Shuttle, you could deinit, delete the whole Space Shuttle folder, reinit and pull the wohle thing from the scratch.

[legoboyvdlp]

Hmmm, will try.
But if I delete the ,git folder, it won't work, surely?

[jwocky]

It should work because it pulls the whole Space Shuttle fresh from the scratch.

[IAHM-COL]

I don't touch SpaceShuttle sacred development.

Hahah, you are full of it.
There's nothing sacred about that aircraft.
Not there is nothing sacred about that repo either.

I look at it as just another repo... one whose content interest me the least.

[IAHM-COL]

@Lego

I ve just updated the SpaceShuttle repository with new work by Thorsten R. et. al., now

Code: Select all

git pull
git submodule deinit Aircraft/SpaceShuttle
git submodule init Aircraft/SpaceShuttle
git submodule update Aircraft/SpaceShuttle


Let me know what happens.
Last commit on SpaceShutlte is 428d7 5h ago

[legoboyvdlp]

Pull, deinit, init, update, check commit.
Yessir.
Will report

And yes, I was joking
No! Mr Hernandez and Mr Brendt are evil! They dare to touch my sacred work! Down with them!