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.

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

Merge conflicts dialog visual updates #6399

Merged
merged 3 commits into from Dec 12, 2018
Merged

Merge conflicts dialog visual updates #6399

merged 3 commits into from Dec 12, 2018

Commits on Dec 11, 2018

  1. Update helper text on merge conflicts dialog

    @ampinsk
    ampinsk committed Dec 11, 2018
    Copy the full SHA
    48c9423 View commit details
    Browse the repository at this point in the history

  2. Use small button in merge conflict dialog list

    @ampinsk
    ampinsk committed Dec 11, 2018
    Copy the full SHA
    1e19d61 View commit details
    Browse the repository at this point in the history

  3. Increase max height on conflicts dialog to show more files

    @ampinsk
    ampinsk committed Dec 11, 2018
    Copy the full SHA
    3e9860a View commit details
    Browse the repository at this point in the history