Skip to content

Fixed unmerge files error detection#731

Merged
vikman90 merged 4 commits intomasterfrom
dev-fix-unmerge-files
Jun 6, 2018
Merged

Fixed unmerge files error detection#731
vikman90 merged 4 commits intomasterfrom
dev-fix-unmerge-files

Conversation

@TJOSERAFAEL
Copy link
Copy Markdown
Contributor

Added error checking when the agent unmerge merged.mg file

@vikman90 vikman90 self-assigned this Jun 6, 2018
@vikman90 vikman90 added the type/bug Something isn't working label Jun 6, 2018
Copy link
Copy Markdown
Member

@vikman90 vikman90 left a comment

Choose a reason for hiding this comment

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

Please add a rule to report that the file could not be unmerged, and fill the changelog.

@vikman90 vikman90 merged commit 528bbc1 into master Jun 6, 2018
@vikman90 vikman90 deleted the dev-fix-unmerge-files branch June 6, 2018 14:14
chemamartinez pushed a commit that referenced this pull request Jun 15, 2018
* Fixed unmerge files error detection

* Added rule for triggering alert

* Updated CHANGELOG

* Fix rule for error on shared file unmerging
bah07 pushed a commit that referenced this pull request Jun 15, 2018
* Fixed unmerge files error detection

* Added rule for triggering alert

* Updated CHANGELOG

* Fix rule for error on shared file unmerging
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

type/bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants