Skip to content

Conversation

@vladimir-ilyashenko
Copy link

No description provided.

@nsano-rururu
Copy link
Contributor

Conflicting file error.
This is an example of the command to be resolved.

git remote add upstream git://github.com/Yelp/elastalert.git
git fetch upstream

git merge upstream/master
git push origin add-parameter-for-slack-aggregation-table-width

@vladimir-ilyashenko
Copy link
Author

@nsano-rururu conflict fixed

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