"C:\Program Files (x86)\Git\bin\git.exe" am --3way --signoff "C:/wow development/trinity/igossip.patch"
Applying: Init player and item gossip
Using index info to reconstruct a base tree...
M	src/server/game/Handlers/MiscHandler.cpp
M	src/server/game/Scripting/ScriptMgr.cpp
M	src/server/game/Scripting/ScriptMgr.h
<stdin>:195: trailing whitespace.
public:
<stdin>:240: trailing whitespace.
public:
warning: 2 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging src/server/game/Scripting/ScriptMgr.h
CONFLICT (content): Merge conflict in src/server/game/Scripting/ScriptMgr.h
Auto-merging src/server/game/Scripting/ScriptMgr.cpp
CONFLICT (content): Merge conflict in src/server/game/Scripting/ScriptMgr.cpp
Auto-merging src/server/game/Handlers/MiscHandler.cpp
Failed to merge in the changes.
Patch failed at 0001 Init player and item gossip
The copy of the patch that failed is found in:
   c:/wow development/trinity/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Done