FreeBSD ports を Git で管理していたらコンフリクトして真顔になった話

## ※ お断り
このお話は「[[FreeBSD] FreeBSD ports tree の更新を portsnap から git (github) に変更](http://w.vmeta.jp/tdiary/?date=20130313)」に記載している内容で実行し、自分の環境で動作させています。
特に portsnap を使ってて困ってない人はこのお話のことは単なる笑い話としてご覧いただければ幸いです。

### 真顔ってどんな顔
とりあえずこんな顔のようです。
[真顔 - Google 検索](https://www.google.co.jp/search?q=%E7%9C%9F%E9%A1%94&tbm=isch)

## あらすじ
### 2016/12/03
0時きっかりに動作するアップデートスクリプトで github の ports リポジトリを pull する
↓
この時にコンフリクトしているというメールを受信
↓
気づかず数日放置

### 数日後
「さてしばらく ports アップデートしてなかったなぁ」
↓
「えなに、コンフリクトしてんの？」と真顔になりながらぼやく

## コンフリクトしている内容
```bash:maildata
From https://github.com/freebsd/freebsd-ports
 + f5e0cf1...a18baf0 master          -> origin/master  (forced update)
 + 4053cfb...0800c40 branches/2015Q4 -> origin/branches/2015Q4  (forced update)
 + b48035a...8eb1d9b branches/2016Q1 -> origin/branches/2016Q1  (forced update)
 + eabade3...bf9eabb branches/2016Q2 -> origin/branches/2016Q2  (forced update)
 + f39824a...3914249 branches/2016Q3 -> origin/branches/2016Q3  (forced update)
 + a70ed18...f06edef branches/2016Q4 -> origin/branches/2016Q4  (forced update)
   61686d0..7dce147  svn_head        -> origin/svn_head
Auto-merging x11/xcb-util-xrm/Makefile
CONFLICT (add/add): Merge conflict in x11/xcb-util-xrm/Makefile
Auto-merging x11-toolkits/qt5-charts/pkg-plist
CONFLICT (add/add): Merge conflict in x11-toolkits/qt5-charts/pkg-plist
Auto-merging x11-toolkits/qt5-charts/Makefile
CONFLICT (add/add): Merge conflict in x11-toolkits/qt5-charts/Makefile
Auto-merging x11-toolkits/p5-Tk/Makefile
Auto-merging www/wt/Makefile
CONFLICT (add/add): Merge conflict in www/wt/Makefile
Auto-merging www/subsonic/Makefile
Auto-merging www/redmine-basecamp/pkg-descr
CONFLICT (content): Merge conflict in www/redmine-basecamp/pkg-descr
Auto-merging www/py-urlobject/pkg-descr
CONFLICT (add/add): Merge conflict in www/py-urlobject/pkg-descr
Auto-merging www/py-goobook/Makefile
CONFLICT (add/add): Merge conflict in www/py-goobook/Makefile
Auto-merging www/py-flask-assets/pkg-descr
CONFLICT (add/add): Merge conflict in www/py-flask-assets/pkg-descr
Auto-merging www/py-django-tastypie/pkg-descr
Auto-merging www/py-cactus/pkg-descr
CONFLICT (add/add): Merge conflict in www/py-cactus/pkg-descr
Auto-merging www/p5-libapreq2/Makefile
Auto-merging www/nginx/Makefile
CONFLICT (content): Merge conflict in www/nginx/Makefile
Auto-merging www/mod_flickr/pkg-descr
Auto-merging www/madsonic/Makefile
Auto-merging www/linux-firefox/distinfo
CONFLICT (content): Merge conflict in www/linux-firefox/distinfo
Auto-merging www/linux-firefox/Makefile
CONFLICT (content): Merge conflict in www/linux-firefox/Makefile
Auto-merging www/libxul/distinfo
CONFLICT (content): Merge conflict in www/libxul/distinfo
Auto-merging www/libxul/Makefile
CONFLICT (content): Merge conflict in www/libxul/Makefile
Auto-merging www/kohana/Makefile
CONFLICT (add/add): Merge conflict in www/kohana/Makefile
Auto-merging www/hs-wai-extra/pkg-descr
Auto-merging www/hs-hjsmin/pkg-descr
CONFLICT (content): Merge conflict in www/hs-hjsmin/pkg-descr
Auto-merging www/glpi/Makefile
CONFLICT (content): Merge conflict in www/glpi/Makefile
Auto-merging www/gitea/Makefile
CONFLICT (add/add): Merge conflict in www/gitea/Makefile
Auto-merging www/firefox/distinfo
CONFLICT (content): Merge conflict in www/firefox/distinfo
Auto-merging www/firefox/Makefile
CONFLICT (content): Merge conflict in www/firefox/Makefile
Auto-merging www/firefox-i18n/distinfo
CONFLICT (content): Merge conflict in www/firefox-i18n/distinfo
Auto-merging www/firefox-i18n/Makefile
CONFLICT (content): Merge conflict in www/firefox-i18n/Makefile
Auto-merging www/firefox-esr/distinfo
CONFLICT (content): Merge conflict in www/firefox-esr/distinfo
Auto-merging www/firefox-esr/Makefile
CONFLICT (content): Merge conflict in www/firefox-esr/Makefile
Auto-merging www/firefox-esr-i18n/distinfo
CONFLICT (content): Merge conflict in www/firefox-esr-i18n/distinfo
Auto-merging www/firefox-esr-i18n/Makefile
CONFLICT (content): Merge conflict in www/firefox-esr-i18n/Makefile
Auto-merging www/Makefile
Auto-merging textproc/sassc/pkg-descr
Auto-merging textproc/py-feedparser/pkg-descr
CONFLICT (content): Merge conflict in textproc/py-feedparser/pkg-descr
Auto-merging textproc/pugixml/Makefile
Auto-merging textproc/p5-Net-IDN-Encode/Makefile
Auto-merging textproc/libxslt/Makefile
Auto-merging textproc/libwps03/Makefile
CONFLICT (content): Merge conflict in textproc/libwps03/Makefile
Auto-merging textproc/kibana50/pkg-plist
CONFLICT (add/add): Merge conflict in textproc/kibana50/pkg-plist
Auto-merging textproc/kibana50/distinfo
CONFLICT (add/add): Merge conflict in textproc/kibana50/distinfo
Auto-merging textproc/kibana50/Makefile
CONFLICT (add/add): Merge conflict in textproc/kibana50/Makefile
Auto-merging textproc/jo/Makefile
CONFLICT (add/add): Merge conflict in textproc/jo/Makefile
Auto-merging textproc/ibus/Makefile
Auto-merging textproc/ibus-qt/Makefile
Auto-merging textproc/hs-highlighting-kate/pkg-descr
Auto-merging textproc/expat2/Makefile
CONFLICT (content): Merge conflict in textproc/expat2/Makefile
Auto-merging textproc/elasticsearch5/pkg-plist
CONFLICT (add/add): Merge conflict in textproc/elasticsearch5/pkg-plist
Auto-merging textproc/elasticsearch5/files/patch-config_elasticsearch.yml
CONFLICT (add/add): Merge conflict in textproc/elasticsearch5/files/patch-config_elasticsearch.yml
Auto-merging textproc/elasticsearch5/files/patch-bin_elasticsearch.in.sh
CONFLICT (add/add): Merge conflict in textproc/elasticsearch5/files/patch-bin_elasticsearch.in.sh
Auto-merging textproc/elasticsearch5/files/elasticsearch.in
CONFLICT (add/add): Merge conflict in textproc/elasticsearch5/files/elasticsearch.in
Auto-merging textproc/elasticsearch5/distinfo
CONFLICT (add/add): Merge conflict in textproc/elasticsearch5/distinfo
Auto-merging textproc/elasticsearch5/Makefile
CONFLICT (add/add): Merge conflict in textproc/elasticsearch5/Makefile
Auto-merging textproc/elasticsearch2-plugin-sql/Makefile
CONFLICT (add/add): Merge conflict in textproc/elasticsearch2-plugin-sql/Makefile
Auto-merging textproc/elasticsearch-plugin-sql/Makefile
Auto-merging textproc/codespell/Makefile
CONFLICT (content): Merge conflict in textproc/codespell/Makefile
Auto-merging sysutils/pick/Makefile
CONFLICT (content): Merge conflict in sysutils/pick/Makefile
Auto-merging sysutils/osquery/Makefile
Auto-merging sysutils/clone/Makefile
Auto-merging sysutils/bsdhwmon/pkg-descr
CONFLICT (content): Merge conflict in sysutils/bsdhwmon/pkg-descr
Auto-merging sysutils/amtc/Makefile
CONFLICT (add/add): Merge conflict in sysutils/amtc/Makefile
Auto-merging security/zeronet/pkg-plist
CONFLICT (add/add): Merge conflict in security/zeronet/pkg-plist
Auto-merging security/zeronet/distinfo
CONFLICT (add/add): Merge conflict in security/zeronet/distinfo
Auto-merging security/zeronet/Makefile
CONFLICT (add/add): Merge conflict in security/zeronet/Makefile
Auto-merging security/vuxml/vuln.xml
CONFLICT (content): Merge conflict in security/vuxml/vuln.xml
Auto-merging security/softhsm/Makefile
CONFLICT (content): Merge conflict in security/softhsm/Makefile
Auto-merging security/py-spake2/pkg-descr
CONFLICT (add/add): Merge conflict in security/py-spake2/pkg-descr
Auto-merging security/p5-openxpki/Makefile
CONFLICT (content): Merge conflict in security/p5-openxpki/Makefile
Auto-merging security/p5-Digest-GOST/Makefile
Auto-merging security/p5-Crypt-SMIME/Makefile
CONFLICT (content): Merge conflict in security/p5-Crypt-SMIME/Makefile
Auto-merging security/p5-Crypt-OpenSSL-X509/Makefile
Auto-merging security/p5-Crypt-GCrypt/Makefile
Auto-merging security/openca-tools-forked/Makefile
Auto-merging security/libtasn1/Makefile
Auto-merging security/libressl/Makefile
CONFLICT (content): Merge conflict in security/libressl/Makefile
Auto-merging security/libressl-devel/Makefile
CONFLICT (add/add): Merge conflict in security/libressl-devel/Makefile
Auto-merging security/hs-tls/pkg-descr
Auto-merging security/gorilla/pkg-descr
CONFLICT (content): Merge conflict in security/gorilla/pkg-descr
Auto-merging security/fwknop/Makefile
CONFLICT (content): Merge conflict in security/fwknop/Makefile
CONFLICT (rename/delete): science/py-pyteomics/distinfo deleted in a18baf0bb92c182ad4bf2566b18c5addf8def942 and renamed in HEAD. Version HEAD of science/py-pyteomics/distinfo left in tree.
Auto-merging science/py-pyteomics/Makefile
CONFLICT (add/add): Merge conflict in science/py-pyteomics/Makefile
Auto-merging science/mcstas/Makefile
CONFLICT (content): Merge conflict in science/mcstas/Makefile
Auto-merging science/gnudatalanguage/Makefile
Auto-merging print/jabref/distinfo
CONFLICT (content): Merge conflict in print/jabref/distinfo
Auto-merging print/jabref/Makefile
CONFLICT (content): Merge conflict in print/jabref/Makefile
Auto-merging ports-mgmt/pkg-devel/Makefile
Auto-merging net/yate/Makefile
Auto-merging net/wireshark/pkg-plist
CONFLICT (content): Merge conflict in net/wireshark/pkg-plist
Auto-merging net/wireshark/distinfo
CONFLICT (content): Merge conflict in net/wireshark/distinfo
Auto-merging net/wireshark/Makefile
CONFLICT (content): Merge conflict in net/wireshark/Makefile
Auto-merging net/rubygem-fog-azure/pkg-descr
CONFLICT (add/add): Merge conflict in net/rubygem-fog-azure/pkg-descr
Auto-merging net/rubygem-azure/pkg-descr
CONFLICT (add/add): Merge conflict in net/rubygem-azure/pkg-descr
Auto-merging net/rubygem-azure-core/pkg-descr
CONFLICT (add/add): Merge conflict in net/rubygem-azure-core/pkg-descr
Auto-merging net/qoauth/pkg-descr
CONFLICT (content): Merge conflict in net/qoauth/pkg-descr
Auto-merging net/py-ripe.atlas.cousteau/pkg-descr
CONFLICT (add/add): Merge conflict in net/py-ripe.atlas.cousteau/pkg-descr
Auto-merging net/py-pcap/Makefile
CONFLICT (content): Merge conflict in net/py-pcap/Makefile
Auto-merging net/py-cloudfiles/pkg-descr
CONFLICT (content): Merge conflict in net/py-cloudfiles/pkg-descr
Auto-merging net/p5-MaxMind-DB-Writer/distinfo
CONFLICT (content): Merge conflict in net/p5-MaxMind-DB-Writer/distinfo
Auto-merging net/p5-MaxMind-DB-Writer/Makefile
CONFLICT (content): Merge conflict in net/p5-MaxMind-DB-Writer/Makefile
Auto-merging net/opensips/Makefile
CONFLICT (add/add): Merge conflict in net/opensips/Makefile
Auto-merging net/openntpd/Makefile
CONFLICT (content): Merge conflict in net/openntpd/Makefile
Auto-merging net/openggsn/Makefile
Auto-merging net/mosquitto/Makefile
Auto-merging net/linphone/Makefile
CONFLICT (content): Merge conflict in net/linphone/Makefile
Auto-merging net/libp0f/Makefile
CONFLICT (add/add): Merge conflict in net/libp0f/Makefile
Auto-merging net/kamailio/Makefile
CONFLICT (content): Merge conflict in net/kamailio/Makefile
Auto-merging net/hs-network-info/pkg-descr
Auto-merging net/hs-aws/pkg-descr
CONFLICT (add/add): Merge conflict in net/hs-aws/pkg-descr
Auto-merging net/h323plus/Makefile
Auto-merging net/concourse-fly/Makefile
CONFLICT (add/add): Merge conflict in net/concourse-fly/Makefile
Auto-merging net/chrony/Makefile
Auto-merging net/bnxt-kmod/distinfo
CONFLICT (add/add): Merge conflict in net/bnxt-kmod/distinfo
Auto-merging net/bnxt-kmod/Makefile
CONFLICT (add/add): Merge conflict in net/bnxt-kmod/Makefile
Auto-merging net/bctoolbox/Makefile
CONFLICT (add/add): Merge conflict in net/bctoolbox/Makefile
Auto-merging net-p2p/btsync/Makefile
Auto-merging net-mgmt/py-snmp_passpersist/pkg-descr
CONFLICT (add/add): Merge conflict in net-mgmt/py-snmp_passpersist/pkg-descr
Auto-merging net-mgmt/prometheus/Makefile
CONFLICT (add/add): Merge conflict in net-mgmt/prometheus/Makefile
Auto-merging net-mgmt/netmagis-topo/Makefile
Auto-merging net-im/telegram-purple/Makefile
CONFLICT (content): Merge conflict in net-im/telegram-purple/Makefile
Auto-merging net-im/ring-gnome/Makefile
CONFLICT (add/add): Merge conflict in net-im/ring-gnome/Makefile
Auto-merging net-im/ring-daemon/Makefile
CONFLICT (add/add): Merge conflict in net-im/ring-daemon/Makefile
Auto-merging net-im/pidgin/Makefile
CONFLICT (content): Merge conflict in net-im/pidgin/Makefile
Auto-merging net-im/libpurple/Makefile
Auto-merging multimedia/tovid/Makefile
CONFLICT (add/add): Merge conflict in multimedia/tovid/Makefile
Auto-merging multimedia/mpv/Makefile
CONFLICT (content): Merge conflict in multimedia/mpv/Makefile
Auto-merging multimedia/libav/Makefile
Auto-merging multimedia/dvbcut/pkg-descr
CONFLICT (content): Merge conflict in multimedia/dvbcut/pkg-descr
Auto-merging misc/lifelines/Makefile
CONFLICT (content): Merge conflict in misc/lifelines/Makefile
Auto-merging misc/amfm/Makefile
Auto-merging math/p5-Math-MPC/distinfo
CONFLICT (content): Merge conflict in math/p5-Math-MPC/distinfo
Auto-merging math/p5-Math-MPC/Makefile
CONFLICT (content): Merge conflict in math/p5-Math-MPC/Makefile
Auto-merging math/p5-Math-Int128/Makefile
Auto-merging math/hs-kan-extensions/pkg-descr
CONFLICT (add/add): Merge conflict in math/hs-kan-extensions/pkg-descr
Auto-merging math/hs-adjunctions/pkg-descr
CONFLICT (add/add): Merge conflict in math/hs-adjunctions/pkg-descr
Auto-merging mail/thunderbird/distinfo
CONFLICT (content): Merge conflict in mail/thunderbird/distinfo
Auto-merging mail/thunderbird/Makefile
CONFLICT (content): Merge conflict in mail/thunderbird/Makefile
Auto-merging mail/thunderbird-i18n/distinfo
CONFLICT (content): Merge conflict in mail/thunderbird-i18n/distinfo
Auto-merging mail/thunderbird-i18n/Makefile
CONFLICT (content): Merge conflict in mail/thunderbird-i18n/Makefile
Auto-merging mail/rspamd/Makefile
CONFLICT (content): Merge conflict in mail/rspamd/Makefile
Auto-merging mail/rmilter/Makefile
CONFLICT (content): Merge conflict in mail/rmilter/Makefile
Auto-merging mail/py-milter/Makefile
CONFLICT (content): Merge conflict in mail/py-milter/Makefile
Auto-merging mail/postfix211/Makefile
CONFLICT (add/add): Merge conflict in mail/postfix211/Makefile
Auto-merging mail/postfix/Makefile
CONFLICT (content): Merge conflict in mail/postfix/Makefile
Auto-merging mail/postfix-current/Makefile
CONFLICT (content): Merge conflict in mail/postfix-current/Makefile
Auto-merging mail/msmtp/Makefile
CONFLICT (content): Merge conflict in mail/msmtp/Makefile
Auto-merging mail/linux-thunderbird/distinfo
CONFLICT (content): Merge conflict in mail/linux-thunderbird/distinfo
Auto-merging mail/linux-thunderbird/Makefile
CONFLICT (content): Merge conflict in mail/linux-thunderbird/Makefile
Auto-merging mail/isbg/pkg-descr
CONFLICT (content): Merge conflict in mail/isbg/pkg-descr
Auto-merging mail/fetchmail/Makefile
CONFLICT (content): Merge conflict in mail/fetchmail/Makefile
Auto-merging mail/dcc-dccd/Makefile
Auto-merging lang/whitespace/Makefile
Auto-merging lang/smlnj/Makefile
Auto-merging lang/py-mx-base/Makefile
Auto-merging lang/p5-List-MoreUtils/Makefile
CONFLICT (content): Merge conflict in lang/p5-List-MoreUtils/Makefile
Auto-merging lang/elixir/Makefile
CONFLICT (content): Merge conflict in lang/elixir/Makefile
Auto-merging lang/dmd2/Makefile.bootstrap
CONFLICT (add/add): Merge conflict in lang/dmd2/Makefile.bootstrap
Auto-merging lang/clang35/Makefile
Removing java/jakarta-struts/pkg-plist
Removing java/jakarta-struts/pkg-descr
Removing java/jakarta-struts/distinfo
CONFLICT (modify/delete): java/jakarta-struts/Makefile deleted in a18baf0bb92c182ad4bf2566b18c5addf8def942 and modified in HEAD. Version HEAD of java/jakarta-struts/Makefile left in tree.
Auto-merging java/Makefile
Auto-merging japanese/php5-mecab/Makefile
Auto-merging japanese/ibus-skk/pkg-descr
CONFLICT (content): Merge conflict in japanese/ibus-skk/pkg-descr
Auto-merging japanese/ebnetd/Makefile
Auto-merging graphics/py-graph-dot/Makefile
Auto-merging graphics/polyclipping/distinfo
CONFLICT (add/add): Merge conflict in graphics/polyclipping/distinfo
Auto-merging graphics/polyclipping/Makefile
CONFLICT (add/add): Merge conflict in graphics/polyclipping/Makefile
Auto-merging graphics/pfstools/Makefile
CONFLICT (content): Merge conflict in graphics/pfstools/Makefile
Auto-merging graphics/p5-Image-ExifTool/pkg-plist
Auto-merging graphics/p5-Image-ExifTool/distinfo
CONFLICT (content): Merge conflict in graphics/p5-Image-ExifTool/distinfo
Auto-merging graphics/p5-Image-ExifTool/Makefile
CONFLICT (content): Merge conflict in graphics/p5-Image-ExifTool/Makefile
Auto-merging graphics/linux-c7-dri/Makefile
CONFLICT (add/add): Merge conflict in graphics/linux-c7-dri/Makefile
Auto-merging graphics/linux-c6-dri/Makefile
CONFLICT (content): Merge conflict in graphics/linux-c6-dri/Makefile
Removing graphics/libopenraw/files/patch-gnomeincludes
Auto-merging graphics/libopenraw/Makefile
CONFLICT (content): Merge conflict in graphics/libopenraw/Makefile
Auto-merging graphics/gnash/pkg-plist
Auto-merging graphics/gnash/Makefile
CONFLICT (content): Merge conflict in graphics/gnash/Makefile
Auto-merging graphics/gegl/Makefile
CONFLICT (content): Merge conflict in graphics/gegl/Makefile
Auto-merging graphics/blender-doc/Makefile
CONFLICT (content): Merge conflict in graphics/blender-doc/Makefile
Auto-merging games/wxlauncher/pkg-descr
CONFLICT (content): Merge conflict in games/wxlauncher/pkg-descr
Auto-merging games/solarus/pkg-plist
CONFLICT (add/add): Merge conflict in games/solarus/pkg-plist
Auto-merging games/solarus/distinfo
CONFLICT (content): Merge conflict in games/solarus/distinfo
Auto-merging games/solarus/Makefile
CONFLICT (content): Merge conflict in games/solarus/Makefile
Auto-merging games/solarus-quest-editor/distinfo
CONFLICT (add/add): Merge conflict in games/solarus-quest-editor/distinfo
Auto-merging games/solarus-quest-editor/Makefile
CONFLICT (add/add): Merge conflict in games/solarus-quest-editor/Makefile
Auto-merging games/retroarch/pkg-descr
CONFLICT (add/add): Merge conflict in games/retroarch/pkg-descr
Auto-merging games/oolite/Makefile
CONFLICT (content): Merge conflict in games/oolite/Makefile
Auto-merging games/jfsw/Makefile
Auto-merging finance/bitcoin-armory/Makefile
CONFLICT (content): Merge conflict in finance/bitcoin-armory/Makefile
Auto-merging emulators/qemu-cheri/distinfo
CONFLICT (add/add): Merge conflict in emulators/qemu-cheri/distinfo
Auto-merging emulators/qemu-cheri/Makefile.snapshot
CONFLICT (add/add): Merge conflict in emulators/qemu-cheri/Makefile.snapshot
Auto-merging emulators/pipelight/Makefile
CONFLICT (content): Merge conflict in emulators/pipelight/Makefile
Auto-merging emulators/dolphin-emu/pkg-plist
CONFLICT (content): Merge conflict in emulators/dolphin-emu/pkg-plist
CONFLICT (modify/delete): emulators/dolphin-emu/files/patch-CMakeTests-FindLibUSB.cmake deleted in a18baf0bb92c182ad4bf2566b18c5addf8def942 and modified in HEAD. Version HEAD of emulators/dolphin-emu/files/patch-CMakeTests-FindLibUSB.cmake left in tree.
CONFLICT (modify/delete): emulators/dolphin-emu/files/patch-CMakeLists.txt deleted in a18baf0bb92c182ad4bf2566b18c5addf8def942 and modified in HEAD. Version HEAD of emulators/dolphin-emu/files/patch-CMakeLists.txt left in tree.
Auto-merging emulators/dolphin-emu/distinfo
CONFLICT (content): Merge conflict in emulators/dolphin-emu/distinfo
Auto-merging emulators/dolphin-emu/Makefile
CONFLICT (content): Merge conflict in emulators/dolphin-emu/Makefile
Auto-merging editors/poedit/Makefile
CONFLICT (content): Merge conflict in editors/poedit/Makefile
Auto-merging dns/powerdns/Makefile
CONFLICT (content): Merge conflict in dns/powerdns/Makefile
Auto-merging dns/adns/Makefile
Auto-merging devel/rubygem-rice/Makefile
CONFLICT (add/add): Merge conflict in devel/rubygem-rice/Makefile
Auto-merging devel/rubygem-micromachine/pkg-descr
CONFLICT (add/add): Merge conflict in devel/rubygem-micromachine/pkg-descr
Auto-merging devel/rubygem-gem-compare/pkg-descr
CONFLICT (add/add): Merge conflict in devel/rubygem-gem-compare/pkg-descr
Auto-merging devel/rubygem-delayed_job/pkg-descr
CONFLICT (content): Merge conflict in devel/rubygem-delayed_job/pkg-descr
Auto-merging devel/rubygem-akismet/pkg-descr
CONFLICT (add/add): Merge conflict in devel/rubygem-akismet/pkg-descr
Auto-merging devel/rapidjson/Makefile
CONFLICT (content): Merge conflict in devel/rapidjson/Makefile
Auto-merging devel/py3-jsonschema/pkg-descr
CONFLICT (add/add): Merge conflict in devel/py3-jsonschema/pkg-descr
Auto-merging devel/py-validictory/pkg-descr
Auto-merging devel/py-terminable_thread/pkg-descr
CONFLICT (add/add): Merge conflict in devel/py-terminable_thread/pkg-descr
Auto-merging devel/py-python-magic/pkg-descr
CONFLICT (add/add): Merge conflict in devel/py-python-magic/pkg-descr
Auto-merging devel/py-python-gist/pkg-descr
CONFLICT (add/add): Merge conflict in devel/py-python-gist/pkg-descr
Auto-merging devel/py-pyqi/pkg-descr
CONFLICT (add/add): Merge conflict in devel/py-pyqi/pkg-descr
Auto-merging devel/py-option_merge/pkg-descr
CONFLICT (add/add): Merge conflict in devel/py-option_merge/pkg-descr
Auto-merging devel/py-opster/pkg-descr
CONFLICT (add/add): Merge conflict in devel/py-opster/pkg-descr
Auto-merging devel/py-noseofyeti/pkg-descr
CONFLICT (add/add): Merge conflict in devel/py-noseofyeti/pkg-descr
Auto-merging devel/py-llfuse/Makefile
CONFLICT (add/add): Merge conflict in devel/py-llfuse/Makefile
Auto-merging devel/py-jep/pkg-plist
CONFLICT (add/add): Merge conflict in devel/py-jep/pkg-plist
Auto-merging devel/py-jep/distinfo
CONFLICT (add/add): Merge conflict in devel/py-jep/distinfo
Auto-merging devel/py-jep/Makefile
CONFLICT (add/add): Merge conflict in devel/py-jep/Makefile
Auto-merging devel/py-freenas.dispatcher/pkg-descr
CONFLICT (add/add): Merge conflict in devel/py-freenas.dispatcher/pkg-descr
Auto-merging devel/py-delfick_error/pkg-descr
CONFLICT (add/add): Merge conflict in devel/py-delfick_error/pkg-descr
Auto-merging devel/py-cycler/pkg-descr
CONFLICT (add/add): Merge conflict in devel/py-cycler/pkg-descr
Auto-merging devel/py-botocore/distinfo
CONFLICT (content): Merge conflict in devel/py-botocore/distinfo
Auto-merging devel/py-botocore/Makefile
CONFLICT (content): Merge conflict in devel/py-botocore/Makefile
Auto-merging devel/py-PyLD/pkg-descr
CONFLICT (add/add): Merge conflict in devel/py-PyLD/pkg-descr
Auto-merging devel/pcre/Makefile
CONFLICT (content): Merge conflict in devel/pcre/Makefile
Auto-merging devel/p5-Test-Strict/distinfo
CONFLICT (content): Merge conflict in devel/p5-Test-Strict/distinfo
Auto-merging devel/p5-Test-Strict/Makefile
CONFLICT (content): Merge conflict in devel/p5-Test-Strict/Makefile
Auto-merging devel/p5-Parse-CPAN-Meta/Makefile
CONFLICT (content): Merge conflict in devel/p5-Parse-CPAN-Meta/Makefile
Auto-merging devel/p5-File-Find-Rule-Perl/Makefile
CONFLICT (content): Merge conflict in devel/p5-File-Find-Rule-Perl/Makefile
Auto-merging devel/p5-Data-Peek/Makefile
Auto-merging devel/p5-CPAN-Meta/Makefile
CONFLICT (content): Merge conflict in devel/p5-CPAN-Meta/Makefile
Auto-merging devel/p5-CBOR-XS/Makefile
Auto-merging devel/opendht/Makefile
CONFLICT (add/add): Merge conflict in devel/opendht/Makefile
Auto-merging devel/ocaml-opam/Makefile
Auto-merging devel/ocaml-camlp4/Makefile
Auto-merging devel/msgpack/Makefile
CONFLICT (content): Merge conflict in devel/msgpack/Makefile
Auto-merging devel/mongo-c-driver/Makefile
CONFLICT (content): Merge conflict in devel/mongo-c-driver/Makefile
Auto-merging devel/mercurial/distinfo
CONFLICT (content): Merge conflict in devel/mercurial/distinfo
Auto-merging devel/mercurial/Makefile
CONFLICT (content): Merge conflict in devel/mercurial/Makefile
Auto-merging devel/libxo/Makefile
Auto-merging devel/libtermkey/Makefile
CONFLICT (content): Merge conflict in devel/libtermkey/Makefile
Auto-merging devel/liborcus07/Makefile
CONFLICT (content): Merge conflict in devel/liborcus07/Makefile
Auto-merging devel/libmpsse/Makefile
Auto-merging devel/libcli/pkg-descr
CONFLICT (content): Merge conflict in devel/libcli/pkg-descr
Auto-merging devel/lfcbase/Makefile
Auto-merging devel/ivykis/Makefile
CONFLICT (add/add): Merge conflict in devel/ivykis/Makefile
Auto-merging devel/icu/Makefile
CONFLICT (content): Merge conflict in devel/icu/Makefile
Auto-merging devel/hs-unix-compat/pkg-descr
Auto-merging devel/hs-reflection/pkg-descr
CONFLICT (content): Merge conflict in devel/hs-reflection/pkg-descr
Auto-merging devel/hs-monad-par/pkg-descr
Auto-merging devel/hs-language-javascript/pkg-descr
CONFLICT (content): Merge conflict in devel/hs-language-javascript/pkg-descr
Auto-merging devel/hs-edit-distance/pkg-descr
CONFLICT (content): Merge conflict in devel/hs-edit-distance/pkg-descr
Auto-merging devel/hs-easy-file/pkg-descr
CONFLICT (add/add): Merge conflict in devel/hs-easy-file/pkg-descr
Auto-merging devel/hs-constraints/pkg-descr
CONFLICT (add/add): Merge conflict in devel/hs-constraints/pkg-descr
Auto-merging devel/hs-blaze-builder/pkg-descr
CONFLICT (content): Merge conflict in devel/hs-blaze-builder/pkg-descr
Auto-merging devel/hs-ansi-wl-pprint/pkg-descr
Auto-merging devel/google-perftools/Makefile
Auto-merging devel/google-gdata/Makefile
Auto-merging devel/go-codec/pkg-descr
CONFLICT (add/add): Merge conflict in devel/go-codec/pkg-descr
Auto-merging devel/gitlab-shell/pkg-plist
CONFLICT (add/add): Merge conflict in devel/gitlab-shell/pkg-plist
Auto-merging devel/gitlab-shell/Makefile
CONFLICT (add/add): Merge conflict in devel/gitlab-shell/Makefile
Auto-merging devel/git/pkg-plist
CONFLICT (content): Merge conflict in devel/git/pkg-plist
Auto-merging devel/git/Makefile
CONFLICT (content): Merge conflict in devel/git/Makefile
Auto-merging devel/git-cinnabar/distinfo
CONFLICT (add/add): Merge conflict in devel/git-cinnabar/distinfo
Auto-merging devel/git-cinnabar/Makefile
CONFLICT (add/add): Merge conflict in devel/git-cinnabar/Makefile
Auto-merging devel/gcc-msp430-ti-toolchain/Makefile
CONFLICT (add/add): Merge conflict in devel/gcc-msp430-ti-towarning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 15710 and retry the command.
olchain/Makefile
Auto-merging devel/efl/Makefile
CONFLICT (content): Merge conflict in devel/efl/Makefile
Auto-merging devel/bsdowl/Makefile
Auto-merging devel/awscli/distinfo
CONFLICT (content): Merge conflict in devel/awscli/distinfo
Auto-merging devel/awscli/Makefile
CONFLICT (content): Merge conflict in devel/awscli/Makefile
Auto-merging devel/avr-gcc/Makefile
Auto-merging devel/avr-gcc-devel/Makefile
Auto-merging devel/arm-none-eabi-gcc492/Makefile
CONFLICT (add/add): Merge conflict in devel/arm-none-eabi-gcc492/Makefile
Auto-merging devel/R-cran-plyr/Makefile
Auto-merging deskutils/egroupware/distinfo
CONFLICT (content): Merge conflict in deskutils/egroupware/distinfo
Auto-merging deskutils/egroupware/Makefile
CONFLICT (content): Merge conflict in deskutils/egroupware/Makefile
Auto-merging databases/sqlrelay/Makefile
Auto-merging databases/rubygem-activerecord-import/pkg-descr
CONFLICT (add/add): Merge conflict in databases/rubygem-activerecord-import/pkg-descr
Auto-merging databases/py-carbon/Makefile
CONFLICT (content): Merge conflict in databases/py-carbon/Makefile
Auto-merging databases/p5-DBD-mysql/Makefile
Auto-merging databases/p5-DBD-cego/Makefile
Auto-merging databases/p5-DBD-Pg/Makefile
Auto-merging databases/mysql57-server/Makefile
CONFLICT (add/add): Merge conflict in databases/mysql57-server/Makefile
Auto-merging databases/mariadb101-server/Makefile
CONFLICT (add/add): Merge conflict in databases/mariadb101-server/Makefile
Auto-merging databases/mariadb101-client/Makefile
CONFLICT (add/add): Merge conflict in databases/mariadb101-client/Makefile
Auto-merging databases/liquibase/Makefile
CONFLICT (content): Merge conflict in databases/liquibase/Makefile
Auto-merging databases/cego/Makefile
Auto-merging converters/hs-aeson-pretty/pkg-descr
CONFLICT (add/add): Merge conflict in converters/hs-aeson-pretty/pkg-descr
Auto-merging comms/trustedqsl/Makefile
CONFLICT (content): Merge conflict in comms/trustedqsl/Makefile
Auto-merging comms/svxlink/Makefile
Auto-merging comms/qsstv/Makefile
CONFLICT (content): Merge conflict in comms/qsstv/Makefile
Removing chinese/mutt/files/patch-zh-mutt
Auto-merging chinese/mutt/Makefile
Auto-merging biology/cd-hit/Makefile
CONFLICT (add/add): Merge conflict in biology/cd-hit/Makefile
Auto-merging audio/p5-Net-FreeDB/Makefile
Auto-merging audio/mpdas/pkg-descr
CONFLICT (content): Merge conflict in audio/mpdas/pkg-descr
Auto-merging audio/mp3unicode/Makefile
Auto-merging audio/libvorbis/Makefile
Auto-merging audio/libogg/Makefile
Auto-merging audio/id3mtag/Makefile
Auto-merging audio/hs-libmpd/pkg-descr
CONFLICT (content): Merge conflict in audio/hs-libmpd/pkg-descr
Auto-merging audio/harp/pkg-descr
CONFLICT (content): Merge conflict in audio/harp/pkg-descr
Auto-merging astro/p5-Starlink-AST/Makefile
Auto-merging archivers/p5-Compress-LZ4/Makefile
Auto-merging Mk/bsd.port.mk
Auto-merging Mk/bsd.gecko.mk
CONFLICT (content): Merge conflict in Mk/bsd.gecko.mk
Auto-merging Mk/bsd.commands.mk
Auto-merging MOVED
CONFLICT (content): Merge conflict in MOVED
Automatic merge failed; fix conflicts and then commit the result.
```

## 対処方法
改めてリポジトリからクローンするだけです。~~ほんとそれだけです、**やま**も**おち**も**いみ**もないです。**やま**も**おち**も**いみ**もないです。大事なことなので2度言いました。~~
ただそのままクローンすると~~バカみたいに~~時間がかかるのでこの [qiita 記事](http://qiita.com/usamik26/items/7bfa61b31344206077fb)を元に最新版のみをクローンします。

```bash:console
# cd /usr
# mv ports ports_
# git clone --depth 1 https://github.com/freebsd/freebsd-ports
# mv freebsd-ports ports
```