Skip to content

[Bug Fix] PR merge should, after switching branches, pull - #4748

Merged
mislav merged 8 commits into
trunkfrom
merge-pull
Nov 29, 2021
Merged

mislav merged 8 commits into
trunkfrom
merge-pull

Conversation

@pxrth9

@pxrth9 pxrth9 commented Nov 17, 2021 •

Copy link
Copy Markdown
Contributor

Fixes #1444
To Do

  • pull the branch after pushing to it
  • connect stdout and stderr, stdin to the user
  • think about adding remote, and branch to the pull command

@pxrth9 pxrth9 changed the title Merge pull request #4728 from cli/codespaces-codeowners [Bug Fix] PR merge should, after switching branches, pull Nov 17, 2021
@pxrth9
pxrth9 requested a review from mislav November 17, 2021 21:11
@pxrth9
pxrth9 marked this pull request as ready for review November 19, 2021 18:38
@pxrth9
pxrth9 requested a review from a team as a code owner November 19, 2021 18:38

@mislav mislav left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I like the shortness of this solution!

Comment thread git/git.go Outdated
Comment thread pkg/cmd/pr/merge/merge.go Outdated
Comment thread git/git.go Outdated
@pxrth9
pxrth9 requested a review from mislav November 24, 2021 23:27

@mislav mislav left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Looks good. Only naming issues remain

Comment thread git/git.go Outdated
Comment thread git/git.go Outdated
Comment thread pkg/cmd/pr/merge/merge.go Outdated
Comment thread pkg/cmd/pr/merge/merge.go Outdated
Comment thread pkg/cmd/pr/merge/merge.go Outdated
@pxrth9
pxrth9 requested a review from mislav November 29, 2021 16:38

@mislav mislav left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Fantastic; thank you!

@mislav
mislav merged commit c987c57 into trunk Nov 29, 2021
@mislav
mislav deleted the merge-pull branch November 29, 2021 17:26
@VictorBatta VictorBatta mentioned this pull request Dec 4, 2021
@bryanjhogan

Copy link
Copy Markdown

Thanks for this change. Much appreciated.

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.

PR merge should, after switching branches, pull

4 participants