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

Bug: broken (dev) CLI command for adding a GenericAssetType #173

Merged
merged 3 commits into from Sep 6, 2021
Merged

Bug: broken (dev) CLI command for adding a GenericAssetType #173

merged 3 commits into from Sep 6, 2021

Conversation

create-issue-branch[bot]
Copy link
Contributor

closes #172

@Flix6x Flix6x marked this pull request as ready for review September 6, 2021 11:18
@Flix6x Flix6x self-assigned this Sep 6, 2021
@Flix6x Flix6x added this to the 0.6.1 milestone Sep 6, 2021
@Flix6x
Copy link
Contributor

Flix6x commented Sep 6, 2021

@meeseeksdev backport to 0.6.x

@lumberbot-app
Copy link

lumberbot-app bot commented Sep 6, 2021

Something went wrong ... Please have a look at my logs.

It seem that the branch you are trying to backport to does not exists.

@Flix6x
Copy link
Contributor

Flix6x commented Sep 6, 2021

@meeseeksdev backport to 0.6.x

@lumberbot-app
Copy link

lumberbot-app bot commented Sep 6, 2021

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout 0.6.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 b3d0895de052b1eff7157459de4cf5cba3c9cede
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #173: Bug: broken (dev) CLI command for adding a GenericAssetType'
  1. Push to a named branch :
git push YOURFORK 0.6.x:auto-backport-of-pr-173-on-0.6.x
  1. Create a PR against branch 0.6.x, I would have named this PR:

"Backport PR #173 on branch 0.6.x (Bug: broken (dev) CLI command for adding a GenericAssetType)"

And apply the correct labels and milestones.

Congratulation you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove Still Needs Manual Backport label once the PR gets merged.

If these instruction are inaccurate, feel free to suggest an improvement.

@Flix6x Flix6x requested a review from nhoening September 6, 2021 12:08
@Flix6x Flix6x merged commit c60bd5c into main Sep 6, 2021
@Flix6x Flix6x deleted the issue-172-Bug_broken_dev_CLI_command_for_adding_a_GenericAssetType branch September 6, 2021 12:23
Flix6x added a commit that referenced this pull request Sep 6, 2021
@create-issue-branch @Flix6x
Backport PR #173: Fix bug: broken (dev) CLI command for adding a Gene…
c23d2e2 
…ricAssetType

Rename CLI option: hover_label becomes description.

* Create draft PR for #172

* Rename CLI option

* Changelog entry

Co-authored-by: Flix6x <Flix6x@users.noreply.github.com>
Co-authored-by: F.N. Claessen <felix@seita.nl>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nhoening nhoening nhoening approved these changes

Assignees

@Flix6x Flix6x

Labels
None yet
Projects
None yet
Milestone
0.6.1
Development

Successfully merging this pull request may close these issues.

Bug: broken (dev) CLI command for adding a GenericAssetType
2 participants
@Flix6x @nhoening