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

Arbitrarymarkdown #947

Closed
wants to merge 11 commits into from

Conversation

poisonous-milk
Copy link
Contributor

Let us see if #904 still happens

Fixes #938
Supersedes #939

@@ -37,7 +37,6 @@ public PullRequestsClientTests()
var result = await _fixture.Create(Helper.UserName, _context.RepositoryName, newPullRequest);

Assert.Equal("a pull request", result.Title);
Assert.False(result.Merged);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems unrelated to the other changes - could you add it back in?

@shiftkey
Copy link
Member

There seems to be some changes in here related to the issue search. Could you refresh my memory on which issue those changes are addressing?

@poisonous-milk
Copy link
Contributor Author

@shiftkey
Those are about #839
My bad. I should create a new branch of master when I started implementing this API. I will soon submit a new version without dependency on my earlier commits.

@shiftkey
Copy link
Member

@chenjiaming93

Given there's some other branches for Pull Request Assignee and Pull Request Merged, you could have a go at rewriting this branch to contain just those commits.

I'll walk you through the process to explain what's happening. You should have a remote named origin and one names upstream, you can check them like this:

git remote -vv

If you only see origin listed, run this:

git remote add upstream https://github.com/octokit/octokit.net.git

And now you've done that, ensure you've got the latest changes from both repositories:

git fetch --all

We'll switch to our branch we're working on:

git checkout arbitrarymarkdown

And we're going to put it back to whatever is the latest from upstream:

git reset upstream/master --hard

If at this point you feel unsure about continuing, this is how you get back to your previous state:

git reset origin/arbitrarymarkdown --hard

Now, we're going to add those three commits onto our new branch:

git cherry-pick cde7254
git cherry-pick 7c1c86f
git cherry-pick b084d9f

Once you've tested out things with a .\build BuildApp, you can push this to reset the PR:

git push origin arbitrarymarkdown --force

@poisonous-milk
Copy link
Contributor Author

@shiftkey no problem. I will do that. Thx

@shiftkey
Copy link
Member

shiftkey commented Nov 3, 2015

Closing in favour of #957

@shiftkey shiftkey closed this Nov 3, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants