gistfile1.txt

(saltdev) mage@mordor:/home/mage/projects/salt % git pull --rebase develop
remote: Counting objects: 1656, done.
remote: Total 1656 (delta 1042), reused 1042 (delta 1042), pack-reused 614
Receiving objects: 100% (1656/1656), 854.78 KiB | 958.00 KiB/s, done.
Resolving deltas: 100% (1250/1250), completed with 447 local objects.
From https://github.com/saltstack/salt
 * branch            develop    -> FETCH_HEAD
   96d786c..3382bc5  develop    -> upstream/develop
 doc/_themes/saltstack2/layout.html                     |   5 +--
 doc/_themes/saltstack2/static/js/webhelp.min_v1.4.4.js |   3 +-
(...)
First, rewinding head to replay your work on top of it...
Applying: use ipadress to validate ipv4/ipv6
Using index info to reconstruct a base tree...
M       salt/config/__init__.py
M       salt/utils/network.py
Falling back to patching base and 3-way merge...
Auto-merging salt/utils/network.py
CONFLICT (content): Merge conflict in salt/utils/network.py
Auto-merging salt/config/__init__.py
error: Failed to merge in the changes.
Patch failed at 0001 use ipadress to validate ipv4/ipv6
The copy of the patch that failed is found in: /home/mage/projects/salt/.git/rebase-apply/patch

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