Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lib/upnp: Fix port order #2980

Closed

Conversation

AudriusButkevicius
Copy link
Member

Purpose

I've got the order wrong.

@AudriusButkevicius
Copy link
Member Author

@st-review merge this please

@st-review
Copy link

🕐 Build status is pending. I'll wait to see if this becomes successful and then merge!

@AudriusButkevicius
Copy link
Member Author

@st-review merge this please

@st-review
Copy link

👌 Merged as 1c7af1a. Thanks, @AudriusButkevicius!

st-review pushed a commit that referenced this pull request Apr 16, 2016
GitHub-Pull-Request: #2980
@st-review st-review closed this Apr 16, 2016
@AudriusButkevicius AudriusButkevicius deleted the upnporder branch April 16, 2016 22:44
@st-review
Copy link

⛔ Merge failed:

$ git fetch -f origin refs/pull/2980/head:pr-2980
$ git fetch -f origin master:orig/master
From github.com:syncthing/syncthing
   e61f424..1c7af1a  master     -> orig/master
$ git reset --hard
HEAD is now at 1c7af1a lib/upnp: Fix port order
$ git checkout master
Already on 'master'
Your branch is up-to-date with 'origin/master'.
$ git reset --hard orig/master
HEAD is now at 1c7af1a lib/upnp: Fix port order
$ git clean -fxd
$ git merge --squash --no-commit pr-2980
Automatic merge went well; stopped before committing as requested
Squash commit -- not updating HEAD
$ git commit -F -
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean

@AudriusButkevicius
Copy link
Member Author

Yeah, because I tricked you!

@st-review st-review added the frozen-due-to-age Issues closed and untouched for a long time, together with being locked for discussion label Jun 16, 2017
@syncthing syncthing locked and limited conversation to collaborators Jun 16, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
frozen-due-to-age Issues closed and untouched for a long time, together with being locked for discussion
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants