Skip to content

Issue/876/merge branch closes window #882

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

Merged

Conversation

andrewpollack
Copy link
Contributor

@andrewpollack andrewpollack commented Aug 28, 2021

This Pull Request fixes/closes #{876}.

It changes the following:

  • Changed merge_branch function to take self as a mutable pointer.
  • Added self.hide(); between merging of branch and push to queue to update.

I followed the checklist:

  • I added unittests
  • I ran make check without errors
  • I tested the overall application
  • I added an appropriate item to the changelog

@extrawurst
Copy link
Collaborator

one round of general GitHub markdown feedback:

This Pull Request fixes/closes #{876}.

if you remove the curly braces, it becomes a nicely clickable link

  • [N/A] I added unittests

just leaving it empty [ ] renders a nice unchecked checkbox

  • [ ✔️ ] I ran make check without errors

just making it [x] renders a checked checkbox.
please use the preview tab to check if you used the GitHub markdown correctly

@extrawurst
Copy link
Collaborator

@andrewpollack is this up to date with master? I cannot rebase-merge it

@andrewpollack
Copy link
Contributor Author

@andrewpollack is this up to date with master? I cannot rebase-merge it

Looks like a few commits merged in between PR and now -- I've updated and now it's up-to-date with master

@andrewpollack
Copy link
Contributor Author

one round of general GitHub markdown feedback:

This Pull Request fixes/closes #{876}.

if you remove the curly braces, it becomes a nicely clickable link

  • [N/A] I added unittests

just leaving it empty [ ] renders a nice unchecked checkbox

  • [ heavy_check_mark ] I ran make check without errors

just making it [x] renders a checked checkbox.
please use the preview tab to check if you used the GitHub markdown correctly

Thank you!! I edited the original with this feedback

@extrawurst extrawurst merged commit 3a1c1a6 into gitui-org:master Aug 30, 2021
@extrawurst extrawurst linked an issue Aug 30, 2021 that may be closed by this pull request
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.

Merge from branch window should close it
2 participants