Skip to content

Switch to status tab after merge / rebase with conflicts #932

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Oct 7, 2021
Merged

Switch to status tab after merge / rebase with conflicts #932

merged 2 commits into from
Oct 7, 2021

Conversation

alessandroasm
Copy link
Contributor

This Pull Request fixes/closes #926.

It changes the following:

  • Switch to status tab after merging or rebasing with conflicts

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
extrawurst requested changes Oct 6, 2021
View reviewed changes
Copy link
Collaborator

@extrawurst extrawurst left a comment

Choose a reason for hiding this comment

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

lgtm - just this one little comment

@extrawurst extrawurst merged commit d84120a into gitui-org:master Oct 7, 2021
@extrawurst
Copy link
Collaborator

@alessandroasm thanks ❤️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@extrawurst extrawurst extrawurst requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

make sure to go into status-tab after merging with conflicts
2 participants
@alessandroasm @extrawurst