The Wayback Machine - https://web.archive.org/web/20201013014511/https://github.com/microsoft/PowerShellForGitHub/pull/89
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

Merge a branch of a repository #89

Open
wants to merge 5 commits into
base: master
from

Conversation

@raghav710
Copy link

@raghav710 raghav710 commented Feb 19, 2019

Does not contain tests yet

Copy link
Member

@HowardWolosky HowardWolosky left a comment

Thanks for the submission. You're off to a great start. There are some areas to improve, but this is looking fairly solid. Much appreciated!

GitHubRepositoryMerge.ps1 Outdated Show resolved Hide resolved
GitHubRepositoryMerge.ps1 Outdated Show resolved Hide resolved
GitHubRepositoryMerge.ps1 Show resolved Hide resolved
GitHubRepositoryMerge.ps1 Show resolved Hide resolved
GitHubRepositoryMerge.ps1 Show resolved Hide resolved
GitHubRepositoryMerge.ps1 Outdated Show resolved Hide resolved
GitHubRepositoryMerge.ps1 Outdated Show resolved Hide resolved
GitHubRepositoryMerge.ps1 Outdated Show resolved Hide resolved
GitHubRepositoryMerge.ps1 Outdated Show resolved Hide resolved
GitHubRepositoryMerge.ps1 Outdated Show resolved Hide resolved
@HowardWolosky
Copy link
Member

@HowardWolosky HowardWolosky commented Mar 18, 2019

Hi @raghav710 -- just reaching out. Are you still working on this?

@raghav710
Copy link
Author

@raghav710 raghav710 commented Mar 19, 2019

@HowardWolosky sorry something came up and I didnt devote my time to this. I am planning to get this done with some form of test cases this weekend. Would that work fine?

@HowardWolosky
Copy link
Member

@HowardWolosky HowardWolosky commented Mar 19, 2019

@raghav710 Not a problem. I just needed to know if this was abandoned. If you're still working on it, please continue to do so at times that are convenient to you. I appreciate the contribution.

S Raghav added 3 commits Mar 24, 2019
…mented

* Includes tests for a few common scenarios

* Contains test cases
@@ -0,0 +1,219 @@
# Copyright (c) Microsoft Corporation. All rights reserved.

This comment has been minimized.

@raghav710

raghav710 Mar 24, 2019
Author

Please ignore this file, I'll remove the associated commit and rebase/squash as required after the GitHubReference changes are in

@@ -0,0 +1,173 @@
# Copyright (c) Microsoft Corporation. All rights reserved.

This comment has been minimized.

@raghav710

raghav710 Mar 24, 2019
Author

Please ignore this file

@raghav710
Copy link
Author

@raghav710 raghav710 commented Mar 24, 2019

@HowardWolosky I have added a set of test cases
I realized I need the functionality to create content in a branch as that will be useful to test the merging and merge conflict related scenarios. You will find GitHubReference related changes in this branch. I'll remove these changes before merging.

@HowardWolosky HowardWolosky self-assigned this Mar 26, 2019
Copy link
Member

@HowardWolosky HowardWolosky left a comment

Hey there,

Again, thanks for the updates, and my apologies for missing that you had actually submitted an update to the PR that I completely missed (doing some project house-cleaning today and noticed that there were these unaddressed PR's).

It looks like there are some minor PR changes being requested here, and some merging/resolving to handle, as well as the fact that you have some of the References stuff in this PR as well. I'll await a further update from you before digging further into this one too deeply.

Thanks!

Tests/GitHubRepositoryMerge.tests.ps1 Show resolved Hide resolved
GitHubReferences.ps1 Show resolved Hide resolved
GitHubReferences.ps1 Show resolved Hide resolved
GitHubRepositoryMerge.ps1 Show resolved Hide resolved
GitHubReferences.ps1 Show resolved Hide resolved
return $result.result
}
catch {
#TODO: Read the error message and find out the kind of issue

This comment has been minimized.

@HowardWolosky

HowardWolosky Jan 13, 2020
Member

What's your plan here?

This comment has been minimized.

@raghav710

raghav710 Mar 22, 2020
Author

The idea was to see if we could extract the status code and give a more informative message to the user. But looks like that would require parsing of the string that we get as an exception which doesn't sound clean to me. I'm leaving this as-is for now. But please do let me know your thoughts on if this can be handled better

@raghav710
Copy link
Author

@raghav710 raghav710 commented Jan 14, 2020

@HowardWolosky thanks for the comments. I'll take stock of the changes (It's been some time since I had a look at the code) and respond to the comments

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.