need someone with steely git-fu to resolve a minor conflict in PR #740
l2dy at macports.org
Sun Feb 25 05:28:26 UTC 2018
On Sat, Feb 24, 2018 at 08:26:41PM -0800, Ken Cunningham wrote:
>I have tried several times to resolve the minor conflict in this PR and I just keep messing it up. It looks super trivial, but ...
>Please, if you do fix it, tell me what you did so I don't have to ask this particular silly question again.
git checkout -b pr-740
curl -O https://patch-diff.githubusercontent.com/raw/macports/macports-ports/pull/740.patch
# ^ remove the conflicting file (diff --git a/aqua/qt4-mac/Portfile ...
# until the next diff --git ...)
git am 740.patch
curl -o aqua/qt4-mac/Portfile https://raw.githubusercontent.com/devernay/macports-ports/8324db7c8b3452e453ce859d2137ae1ae6a76743/aqua/qt4-mac/Portfile
# ^ URL from https://github.com/macports/macports-ports/pull/740/files ("View" button on the right)
git add aqua/qt4-mac/Portfile
git commit --amend --no-edit
git push -f git at github.com:devernay/macports-ports.git pr-740:qt4-mac-tiger
I'm using a shallow clone so I can't push to an outdated branch, but it
should work for you.
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 3612 bytes
Desc: not available
More information about the macports-dev