I am using git to work with MP, both to pull the current
version from g...@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 ..." 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
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 g...@github.com:janstary/macports-ports.git (fetch)
origin g...@github.com:janstary/macports-ports.git (push)
upstreamg...@github.com:macports/macports-ports.git (fetch)
upstreamg...@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.
