[DiscordArchive] Was there no message when you ran the git commands?
[DiscordArchive] Was there no message when you ran the git commands?
Original source
Was there no message when you ran the git commands?
rektbyfaith
01-06-2023, 11:33 PM #1Archived author: Revision • Posted: 2023-01-06T23:33:13.210000+00:00
Original source
Was there no message when you ran the git commands?
Original source
ammm
rektbyfaith
01-06-2023, 11:33 PM #2Archived author: Deleted User • Posted: 2023-01-06T23:33:31.600000+00:00
Original source
ammm
Original source
wait retry
rektbyfaith
01-06-2023, 11:33 PM #3Archived author: Deleted User • Posted: 2023-01-06T23:33:36.438000+00:00
Original source
wait retry
Original source
Updating c05c45c51..b89eea668
error: Your local changes to the following files would be overwritten by merge:
src/common/Configuration/Config.cpp
src/server/apps/worldserver/worldserver.conf.dist
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Server/WorldSession.cpp
Please commit your changes or stash them before you merge.
Aborting
rektbyfaith
01-06-2023, 11:34 PM #4Archived author: Deleted User • Posted: 2023-01-06T23:34:20.539000+00:00
Original source
Updating c05c45c51..b89eea668
error: Your local changes to the following files would be overwritten by merge:
src/common/Configuration/Config.cpp
src/server/apps/worldserver/worldserver.conf.dist
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Server/WorldSession.cpp
Please commit your changes or stash them before you merge.
Aborting
Original source
yes error
rektbyfaith
01-06-2023, 11:34 PM #5Archived author: Deleted User • Posted: 2023-01-06T23:34:25.895000+00:00
Original source
yes error
Original source
git
rektbyfaith
01-06-2023, 11:34 PM #6Archived author: Deleted User • Posted: 2023-01-06T23:34:27.351000+00:00
Original source
git
Original source
so there u have ur reason
rektbyfaith
01-06-2023, 11:34 PM #7Archived author: Rymercyble • Posted: 2023-01-06T23:34:34.948000+00:00
Original source
so there u have ur reason
Original source
ammm
rektbyfaith
01-06-2023, 11:35 PM #8Archived author: Deleted User • Posted: 2023-01-06T23:35:23.700000+00:00
Original source
ammm
Original source
I assume you have made changes to the source, otherwise I'd recommend `git reset --hard origin/master`.
rektbyfaith
01-06-2023, 11:35 PM #9Archived author: Revision • Posted: 2023-01-06T23:35:32.308000+00:00
Original source
I assume you have made changes to the source, otherwise I'd recommend `git reset --hard origin/master`.
Original source
ammm
rektbyfaith
01-06-2023, 11:37 PM #10Archived author: Deleted User • Posted: 2023-01-06T23:37:21.431000+00:00
Original source
ammm