Skip to content

Clean agent dependencies (backport #343)#344

Merged
pablogs9 merged 2 commits intomainfrom
mergify/bp/main/pr-343
Jun 24, 2021
Merged

Clean agent dependencies (backport #343)#344
pablogs9 merged 2 commits intomainfrom
mergify/bp/main/pr-343

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jun 24, 2021

This is an automatic backport of pull request #343 done by Mergify.
Cherry-pick of 98467eb has failed:

On branch mergify/bp/main/pr-343
Your branch is up to date with 'origin/main'.

You are currently cherry-picking commit 98467eb.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   config/agent_uros_packages.repos

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

(cherry picked from commit 98467eb)

# Conflicts:
#	config/agent_uros_packages.repos
@mergify mergify Bot requested a review from pablogs9 as a code owner June 24, 2021 07:31
@mergify mergify Bot added the conflicts label Jun 24, 2021
@mergify mergify Bot mentioned this pull request Jun 24, 2021
@pablogs9 pablogs9 merged commit 705a98d into main Jun 24, 2021
@pablogs9 pablogs9 deleted the mergify/bp/main/pr-343 branch June 24, 2021 07:52
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.

1 participant