Михаил@DESKTOP-UK1N4HK MINGW64 /f/server/bfa-dev (dev|REBASE 7/21)
$ git add .

Михаил@DESKTOP-UK1N4HK MINGW64 /f/server/bfa-dev (dev|REBASE 7/21)
$ git rebase --continue
Applying: Core/AirDrop: Work started (Added for joint implementation with DeadMuse)
Applying: Added missing sql
.git/rebase-apply/patch:21: trailing whitespace.
insert  into `airdrop_spawn`(`Id`,`MapId`,`ZoneId`,`StartX`,`StartY`,`StartZ`,`ndX`,`EndY`,`EndZ`) values
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: Core/AirDrop: Update
.git/rebase-apply/patch:30: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M       src/server/game/AirDrop/AirDropMgr.cpp
M       src/server/game/AirDrop/AirDropMgr.h
M       src/server/game/Entities/GameObject/GameObject.cpp
M       src/server/game/Entities/GameObject/GameObject.h
M       src/server/game/Entities/Object/Object.cpp
M       src/server/game/Server/Packets/GameObjectPackets.cpp
M       src/server/game/Server/Packets/GameObjectPackets.h
M       src/server/game/Server/Protocol/Opcodes.cpp
M       src/server/game/Spells/SpellEffects.cpp
M       src/server/scripts/World/go_scripts.cpp
M       src/server/scripts/World/npcs_special.cpp
Falling back to patching base and 3-way merge...
Auto-merging src/server/scripts/World/npcs_special.cpp
CONFLICT (content): Merge conflict in src/server/scripts/World/npcs_special.cpp
Auto-merging src/server/scripts/World/go_scripts.cpp
CONFLICT (content): Merge conflict in src/server/scripts/World/go_scripts.cpp
Auto-merging src/server/game/Spells/SpellEffects.cpp
Auto-merging src/server/game/Server/Protocol/Opcodes.cpp
Auto-merging src/server/game/Entities/Object/Object.cpp
Auto-merging src/server/game/Entities/GameObject/GameObject.h
Auto-merging src/server/game/AirDrop/AirDropMgr.h
CONFLICT (content): Merge conflict in src/server/game/AirDrop/AirDropMgr.h
Auto-merging src/server/game/AirDrop/AirDropMgr.cpp
CONFLICT (content): Merge conflict in src/server/game/AirDrop/AirDropMgr.cpp
Auto-merging sql/updates/world_bfa/11/2018_11_13_00_world_creature.sql
CONFLICT (add/add): Merge conflict in sql/updates/world_bfa/11/2018_11_13_00_wold_creature.sql
error: Failed to merge in the changes.
Patch failed at 0009 Core/AirDrop: Update
Use 'git am --show-current-patch' to see the failed patch

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort.


Михаил@DESKTOP-UK1N4HK MINGW64 /f/server/bfa-dev (dev|REBASE 9/21)
$ ^C

Михаил@DESKTOP-UK1N4HK MINGW64 /f/server/bfa-dev (dev|REBASE 9/21)
$