Skip to content
This repository has been archived by the owner on Nov 9, 2022. It is now read-only.

Dev issue #535 #536

Closed
wants to merge 10 commits into from
Closed

Dev issue #535 #536

wants to merge 10 commits into from

Conversation

jmeekhof
Copy link
Contributor

@jmeekhof jmeekhof commented Oct 7, 2015

I've opened issue 535 to describe the issue this patch fixes.

@joemfb
Copy link
Contributor

joemfb commented Oct 7, 2015

It looks like this pull request includes some previous commits already on dev. Could you rebase your branch so that this PR only includes your commit?

git rebase upstream/dev

(Assuming that you have a git remote called upstream pointing to marklogic/roxy... If not see https://github.com/marklogic/roxy/blob/master/CONTRIBUTING.md#fork-roxy for setup instructions)

link for clarity: #535

@jmeekhof
Copy link
Contributor Author

jmeekhof commented Oct 7, 2015

Sure. Let me figure out how to do that.

@jmeekhof jmeekhof closed this Oct 7, 2015
@joemfb
Copy link
Contributor

joemfb commented Oct 7, 2015

@jmeekhof, you can just push more commits to your branch to update the PR (and you'll need to do a force push with rebased commits)

git push origin dev -f

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants