conflicts with master

[Jan Stary]

I am using git to work with MP, both to pull the current
version from git at github.com:macports/macports-ports.git
and to create pull requests in my fork.

Now, I a pull from upstream, as always, but:


$ git branch --list
* master
  ssl

$ git status
On branch master
Your branch is up to date with 'origin/master'.

Untracked files:
  (use "git add <file>..." to include in what will be committed)

	typescript

nothing added to commit but untracked files present (use "git add" to track)

$ git log -1
33mcommit 101e557b4b08974559402a3c5cf6e247561ef5e7m33m (m1;36mHEAD -> m1;32mmasterm33m, m1;31morigin/masterm33m, m1;31mm33mm33mm1;36mm1;32mm33mm1;31mm33mm1;31morigin/HEADm33m)mm
Author: Ryan Schmidt <ryandesign at macports.org>
Date:	Tue May 22 00:49:11 2018 -0500

    py-ligo-common: license GPL-3+m


(So far so good: my fork's master is a few days behind
the upstream's master.)

$ git remote -v
origin	git at github.com:janstary/macports-ports.git (fetch)
origin	git at github.com:janstary/macports-ports.git (push)
upstream	git at github.com:macports/macports-ports.git (fetch)
upstream	git at github.com:macports/macports-ports.git (push)

$ git pull
Enter passphrase for key '/Users/hans/.ssh/id_rsa':
Already up to date.

$ git pull upstream master
Enter passphrase for key '/Users/hans/.ssh/id_rsa':
remote: Counting objects: 315, done.K
remote: Compressing objects: 100% (9/9), done.K
remote:nTotale315:(delta(167),1reused 176 (delta 167), pack-reused 137K
Receiving objects: 100% (315/315), 75.38 KiB | 175.00 KiB/s, done.
Resolving deltas: 100% (168/168), completed with 130 local objects.
>From github.com:macports/macports-ports
 * branch		   master     -> FETCH_HEAD
   36cf75c082..b844f1a528  master     -> upstream/master
Auto-merging x11/wine-devel/Portfile
CONFLICT (content): Merge conflict in x11/wine-devel/Portfile
Auto-merging textproc/pdfgrep/Portfile
Auto-merging sysutils/lirc/Portfile
Auto-merging sysutils/MacPorts/Portfile
CONFLICT (content): Merge conflict in sysutils/MacPorts/Portfile
Auto-merging shells/xonsh/Portfile
CONFLICT (content): Merge conflict in shells/xonsh/Portfile
Auto-merging security/stunnel/Portfile
CONFLICT (content): Merge conflict in security/stunnel/Portfile
Auto-merging security/opensc/Portfile
Auto-merging science/volk-gnss-sdr/Portfile
CONFLICT (content): Merge conflict in science/volk-gnss-sdr/Portfile
Auto-merging science/uhd/Portfile
CONFLICT (content): Merge conflict in science/uhd/Portfile
Auto-merging science/osmocore/Portfile
CONFLICT (content): Merge conflict in science/osmocore/Portfile
Auto-merging science/molden/Portfile
CONFLICT (content): Merge conflict in science/molden/Portfile
Auto-merging science/magic/Portfile
CONFLICT (content): Merge conflict in science/magic/Portfile
Auto-merging science/gnuradio/Portfile
CONFLICT (content): Merge conflict in science/gnuradio/Portfile
Auto-merging science/gnss-sdr/Portfile
CONFLICT (content): Merge conflict in science/gnss-sdr/Portfile
Removing science/geoexpress-sdk/Portfile
Auto-merging ruby/rb-ruby-debug-base/Portfile
CONFLICT (content): Merge conflict in ruby/rb-ruby-debug-base/Portfile
Auto-merging ruby/rb-mocha/Portfile
CONFLICT (content): Merge conflict in ruby/rb-mocha/Portfile
Auto-merging ruby/rb-flexmock/Portfile
CONFLICT (content): Merge conflict in ruby/rb-flexmock/Portfile
Auto-merging python/py-zeroc-ice35/Portfile
Auto-merging python/py-xattr/Portfile
CONFLICT (content): Merge conflict in python/py-xattr/Portfile
Auto-merging python/py-tqdm/Portfile
CONFLICT (content): Merge conflict in python/py-tqdm/Portfile
Removing python/py-spyder/files/spyderlib_widgets_shell.py.diff
Removing python/py-spyder/files/spyderlib_utils_programs.py.diff
Removing python/py-spyder/files/spyderlib_start_app.py.diff
Removing python/py-spyder/files/spyderlib_plugins_editor.py.diff
Removing python/py-spyder/files/spyderlib_baseconfig.py.diff
Removing python/py-spyder/files/patch-widgets-pylintgui.py.diff
Auto-merging python/py-spyder/files/patch-spyder_utils_syntaxhighlighters.py.diff
Auto-merging python/py-spyder/files/patch-spyder_config_base.py.diff
Auto-merging python/py-spyder/files/patch-spyder_app_mainwindow.py.diff
Removing python/py-spyder/files/ipython_checks.diff
Removing python/py-spyder-devel/files/spyderlib_start_app.py.diff
Removing python/py-spyder-devel/files/spyderlib_plugins_editor.py.diff
Auto-merging python/py-spyder-devel/files/patch-spyder_utils_syntaxhighlighters.py.diff
Auto-merging python/py-spyder-devel/files/patch-spyder_utils_programs.py.diff
Auto-merging python/py-spyder-devel/files/patch-spyder_app_mainwindow.py.diff
Removing python/py-spyder-devel/files/ipython_checks.diff
Auto-merging python/py-pygmsh/Portfile
CONFLICT (content): Merge conflict in python/py-pygmsh/Portfile
Auto-merging python/py-graveyard/Portfile
Auto-merging python/py-appscript/Portfile
CONFLICT (content): Merge conflict in python/py-appscript/Portfile
Auto-merging print/ghostscript/Portfile
Removing php/php-rar/files/patch-config.m4.diff
Auto-merging perl/p5-astro-spacetrack/Portfile
CONFLICT (content): Merge conflict in perl/p5-astro-spacetrack/Portfile
Auto-merging perl/p5-astro-satpass/Portfile
CONFLICT (content): Merge conflict in perl/p5-astro-satpass/Portfile
Auto-merging net/youtube-dl/Portfile
CONFLICT (content): Merge conflict in net/youtube-dl/Portfile
Auto-merging net/wireshark2/Portfile
Auto-merging net/scapy/Portfile
CONFLICT (content): Merge conflict in net/scapy/Portfile
Auto-merging net/nss/Portfile
CONFLICT (content): Merge conflict in net/nss/Portfile
Auto-merging multimedia/mythtv.28/Portfile
Auto-merging multimedia/mlt/Portfile
Auto-merging multimedia/VLC/Portfile
CONFLICT (content): Merge conflict in multimedia/VLC/Portfile
Auto-merging math/maxima/Portfile
CONFLICT (content): Merge conflict in math/maxima/Portfile
Auto-merging math/OpenBLAS/Portfile
CONFLICT (content): Merge conflict in math/OpenBLAS/Portfile
Auto-merging lang/sbcl/Portfile
CONFLICT (content): Merge conflict in lang/sbcl/Portfile
Auto-merging lang/rust/Portfile
CONFLICT (content): Merge conflict in lang/rust/Portfile
Auto-merging java/zeroc-ice35-java/Portfile
Auto-merging graphics/glfw/Portfile
CONFLICT (content): Merge conflict in graphics/glfw/Portfile
Auto-merging graphics/field3d/Portfile
Auto-merging gnome/gstreamer1-gst-plugins-bad/Portfile
CONFLICT (content): Merge conflict in gnome/gstreamer1-gst-plugins-bad/Portfile
Auto-merging gnome/gnucash/Portfile
CONFLICT (content): Merge conflict in gnome/gnucash/Portfile
Auto-merging gnome/gnome-internet-radio-locator/Portfile
CONFLICT (content): Merge conflict in gnome/gnome-internet-radio-locator/Portfile
Auto-merging gis/gdal/files/template-ed-GDALmake_opt
CONFLICT (add/add): Merge conflict in gis/gdal/files/template-ed-GDALmake_opt
Removing gis/gdal/files/patch-netcdfdataset_cpp.diff
Auto-merging gis/gdal/Portfile
CONFLICT (content): Merge conflict in gis/gdal/Portfile
Auto-merging games/wtf/Portfile
CONFLICT (content): Merge conflict in games/wtf/Portfile
Removing emulators/xhyve/files/missing-include.diff
Auto-merging editors/atom/Portfile
CONFLICT (content): Merge conflict in editors/atom/Portfile
Auto-merging devel/zmq/Portfile
CONFLICT (content): Merge conflict in devel/zmq/Portfile
Removing devel/wangle/files/patch-shared.diff
Auto-merging devel/wangle/Portfile
CONFLICT (content): Merge conflict in devel/wangle/Portfile
Removing devel/svn2git/files/local-config.pri.in
Auto-merging devel/subversion-python27bindings/Portfile
Removing devel/re2/files/patch-Makefile.diff
Removing devel/pmk/files/patch-pmkcfg.sh
Removing devel/pmk/files/patch-detect_cpu_asm.s.diff
Removing devel/pmk/Portfile
Auto-merging devel/npm6/Portfile
CONFLICT (content): Merge conflict in devel/npm6/Portfile
Removing devel/nodejs10/files/patch-tools-gyp-pylib-gyp-generator-make.py.diff
Auto-merging devel/nodejs10/Portfile
CONFLICT (content): Merge conflict in devel/nodejs10/Portfile
Auto-merging devel/libuv/Portfile
CONFLICT (content): Merge conflict in devel/libuv/Portfile
Auto-merging devel/libsigcxx3/Portfile
CONFLICT (content): Merge conflict in devel/libsigcxx3/Portfile
Auto-merging devel/libphonenumber-cpp/Portfile
CONFLICT (content): Merge conflict in devel/libphonenumber-cpp/Portfile
Auto-merging devel/jsoncpp/Portfile
CONFLICT (content): Merge conflict in devel/jsoncpp/Portfile
Auto-merging devel/gwenhywfar4/Portfile
Auto-merging devel/grpc/Portfile
Removing devel/glib2-devel/files/gcocoanotificationbackend.patch
Auto-merging devel/git-ftp/Portfile
CONFLICT (content): Merge conflict in devel/git-ftp/Portfile
Auto-merging devel/folly/Portfile
Auto-merging devel/fbthrift/Portfile
Auto-merging devel/cppzmq/Portfile
CONFLICT (content): Merge conflict in devel/cppzmq/Portfile
Removing devel/cmake/files/patch-Modules-FindQt4.cmake.devel.diff
Auto-merging devel/cmake/Portfile
CONFLICT (content): Merge conflict in devel/cmake/Portfile
Auto-merging devel/cargo/Portfile
Removing devel/bison/files/secure_snprintf.patch
Auto-merging devel/aqbanking5/Portfile
Auto-merging databases/leveldb/Portfile
Auto-merging databases/hiredis/files/install_name.patch
CONFLICT (add/add): Merge conflict in databases/hiredis/files/install_name.patch
Auto-merging databases/hiredis/files/cp.patch
CONFLICT (add/add): Merge conflict in databases/hiredis/files/cp.patch
Removing audio/rubberband/files/patch-Accelerate.diff
Auto-merging aqua/fltk/Portfile
CONFLICT (content): Merge conflict in aqua/fltk/Portfile
Auto-merging aqua/emacs-mac-app/Portfile
CONFLICT (content): Merge conflict in aqua/emacs-mac-app/Portfile
Auto-merging _resources/port1.0/group/qt5-1.0.tcl
Auto-merging _resources/port1.0/group/python-1.0.tcl
Auto-merging _resources/macports1.0/xcode_versions.ini
CONFLICT (content): Merge conflict in _resources/macports1.0/xcode_versions.ini
Removing _ci/patch-portindex.diff
Automatic merge failed; fix conflicts and then commit the result.


Where do all these conflict come form?
Taking aqua/fltk/Portfile as a random exaple:


<<<<<<< HEAD
version         1.4.x-r12914
checksums       rmd160 1011e127d5e0c6fa45ce7210e1b2cc800026d4c6 \
		sha256 fb65e91f8a53c29d3f0b1c1f6f40bbae6e06252f82e4d09277957ec27ea97544 \
		size   5373828
=======
version		1.4.x-r12923
checksums	rmd160 a8e1d199094e19cbde47c9cb858541bbd465f62c \
		sha256 fb6597f6fd1beb105f42988139269f4434ee5c559d93bb30eb13e2ddaea226c4
\
		size 5379730
>>>>>>> b844f1a528a327814ff841cad9f5db7e53a4a62f


How is this a "conflict" why doesn't the pull
just update my local repo with the newer versions,
like it always has?

	Jan