Beaste@BEASTE-PC /c/MANGOS (master)
$ git pull --rebase origin master
From github.com:mangos/mangos
 * branch            master     -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Fast-forwarded master to 36dd99c8f68042f28e602f0089b946ec3fdd64bb.

Beaste@BEASTE-PC /c/MANGOS (master)
$ git add sql/mangos.sql

Beaste@BEASTE-PC /c/MANGOS (master)
$ git add sql/updates/9999_01_spell_proc_event.sql

Beaste@BEASTE-PC /c/MANGOS (master)
$ git commit -m "Fix 16164 proc conditions"
[master c838996] Fix 16164 proc conditions
 2 files changed, 3 insertions(+), 1 deletions(-)
 create mode 100644 sql/updates/9999_01_spell_proc_event.sql

Beaste@BEASTE-PC /c/MANGOS (master)
$ git fetch origin master
From github.com:mangos/mangos
 * branch            master     -> FETCH_HEAD

Beaste@BEASTE-PC /c/MANGOS (master)
$ git pull --rebase origin master
From github.com:mangos/mangos
 * branch            master     -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: [9903] Fixed build problem at *nix.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging src/game/SharedDefines.h
Auto-merging src/game/Unit.h
Auto-merging src/shared/revision_nr.h
CONFLICT (content): Merge conflict in src/shared/revision_nr.h
Failed to merge in the changes.
Patch failed at 0001 [9903] Fixed build problem at *nix.

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".