search

g4klx / YSFClients

System Fusion network servers; a gateway and a parrot.
GNU General Public License v2.0
83 stars 95 forks source link

Git Pull for YSFGateway, updating 0ad3f87..74a8443 fails #159

Open W0RAY opened 4 years ago

W0RAY commented 4 years ago

I have been unable to locate a solution for this YSFGateway update problem … could use some help. Log is attached … error! YSFGateway not started! '/usr/local/bin/YSFGateway.old' -> '/usr/local/bin/YSFGateway.old1' '/usr/local/bin/YSFGateway' -> '/usr/local/bin/YSFGateway.old' Updating YSFGateway with Git Pull Updating 0ad3f87..74a8443 error: Your local changes to the following files would be overwritten by merge: YSFGateway/YSFGateway.ini Please commit your changes or stash them before you merge. Aborting Performing Make on new MMDVMHost files make: *** No rule to make target 'clean'. Stop. '/home/pi/Downloads/YSFClients/YSFGateway/YSFGateway' -> '/usr/local/bin/YSFGateway' Update Complete Restarting YSFGateway

I am not familiar with "commit" or "stash" process as referenced in the "Please commit" line.

ChrisK9EQ commented 4 years ago

It would help if you provided more information. What did you do? What are you running? As far as Git goes, it is telling you that it cannot do an update because you have made changes to YSFGateway.ini. If it does the merge, these changes will be lost. Why you are doing a merge is beyond me. That has to do with the first two questions.

A workaround is to delete YSFGateway.ini then repeat the process you were doing.

In the future you may want to ask questions such as these on the MNWis Fusion Technical Net held Monday nights at 7:30 PM Central Room/YSF #21,493. See HamOperator.com. The issues here are for issues with the actual software. I.e., YSFClients is doing "this" but it should be doing "that". The correct place for asking these questions pertains to my first two questions.

73, Chris, K9EQ

W0RAY commented 4 years ago

Thank you ...

Certified/Authorized g4klx MMDVM software

Certified/Authorized ZUM Radio-MMDVM for Pi v0.9 board.

Seems to be JUST the place to ask for help.

Your tone is not appreciated. Thanks anyway.

7 3 RayH W0RAY

Get Outlook for Androidhttps://aka.ms/ghei36

From: ChrisK9EQ notifications@github.com Sent: Wednesday, January 1, 2020 1:04:13 PM To: g4klx/YSFClients YSFClients@noreply.github.com Cc: W0RAY harden.ray@outlook.com; Author author@noreply.github.com Subject: Re: [g4klx/YSFClients] Git Pull for YSFGateway, updating 0ad3f87..74a8443 fails (#159)

It would help if you provided more information. What did you do? What are you running? As far as Git goes, it is telling you that it cannot do an update because you have made changes to YSFGateway.ini. If it does the merge, these changes will be lost. Why you are doing a merge is beyond me. That has to do with the first two questions.

A workaround is to delete YSFGateway.ini then repeat the process you were doing.

In the future you may want to ask questions such as these on the MNWis Fusion Technical Net held Monday nights at 7:30 PM Central Room/YSF #21https://github.com/g4klx/YSFClients/pull/21,493. See HamOperator.com. The issues here are for issues with the actual software. I.e., YSFClients is doing "this" but it should be doing "that". The correct place for asking these questions pertains to my first two questions.

73, Chris, K9EQ

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHubhttps://github.com/g4klx/YSFClients/issues/159?email_source=notifications&email_token=AG5LWJXDSRFR3H5ESCQACC3Q3TSK3A5CNFSM4KB3XNIKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEH5KU7Y#issuecomment-570075775, or unsubscribehttps://github.com/notifications/unsubscribe-auth/AG5LWJXTIKCY6GDMKZPXHDLQ3TSK3ANCNFSM4KB3XNIA.