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

Show scm messages in errors #1420

Merged
merged 8 commits into from
Nov 12, 2020
Merged

Conversation

pfeuffer
Copy link
Member

@pfeuffer pfeuffer commented Nov 11, 2020

Proposed changes

This change will include messages from the scm protocol in modification or merge errors, so that information from pre receive hooks aren't lost in transmission but can be displayed.

Your checklist for this pull request

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.

  • PR is well described
  • Related issues linked to PR if existing and labels set
  • Target branch is not master (in most cases develop should bet the target of choice)
  • Code does not conflict with target branch
  • New code is covered with unit tests
  • CHANGELOG.md updated
  • Definition of Done's fulfilled: DoD // UI DoD
  • Documentation updated (only necessary for new features or changed behaviour)

Checklist for branch merge request (not required for forks)

@pfeuffer pfeuffer force-pushed the feature/show_scm_messages_in_errors branch from 620babf to a479fcb Compare November 12, 2020 10:41
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities (and Security Hotspot 0 Security Hotspots to review)
Code Smell A 0 Code Smells

48.3% 48.3% Coverage
0.0% 0.0% Duplication

@eheimbuch eheimbuch merged commit 85d485d into develop Nov 12, 2020
@eheimbuch eheimbuch deleted the feature/show_scm_messages_in_errors branch November 12, 2020 13:47
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.

2 participants