Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

docs: update docs to reflect addition of mutually exclusive attributes#2057

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
nejch merged 1 commit intopython-gitlab:mainfromwalterrowe:main
Jun 6, 2022
Merged

Conversation

walterrowe
Copy link
Contributor

@walterrowewalterrowe commentedJun 5, 2022
edited
Loading

Add the mutually exclusive attributes feature to documentation.

@walterrowewalterrowe changed the title[doc] add mutually exclusive attributes to manager jinja template[doc] documentation updates to reflect addition of mutually exclusive attributesJun 5, 2022
@walterrowe
Copy link
ContributorAuthor

I’ve somehow managed to get two commits into this PR that are not my commits. How do we remove them?

@JohnVillalovos
Copy link
Member

I’ve somehow managed to get two commits into this PR that are not my commits. How do we remove them?

Steps I took to fix this:

$ git fetch$ gh pr checkout 2057remote: Enumerating objects: 20, done.remote: Counting objects: 100% (16/16), done.remote: Compressing objects: 100% (4/4), done.remote: Total 10 (delta 6), reused 10 (delta 6), pack-reused 0Unpacking objects: 100% (10/10), 1.92 KiB | 393.00 KiB/s, done.From github.com:python-gitlab/python-gitlab * [new ref]         refs/pull/2057/head -> walterrowe/mainSwitched to branch 'walterrowe/main'$ git rebase origin/maindropping 48a1b6d16b49a2f1763cbb20eda66820c49fdeae test: add more tests for RequiredOptional -- patch contents already upstreamdropping 7c9d3905669d9b2d456b832e709834a288b7a496 chore(cli): rename "object" to "GitLab resource" -- patch contents already upstreamSuccessfully rebased and updated refs/heads/walterrowe/main.$ git push --force-with-lease git@github.com:walterrowe/python-gitlab.git HEAD:mainTo github.com:walterrowe/python-gitlab.git ! [rejected]        HEAD -> main (stale info)error: failed to push some refs to 'github.com:walterrowe/python-gitlab.git'# Normally I use --force-with-lease to make sure I don't break anything.# But in this case it didn't work. So I then used --force$ git push --force git@github.com:walterrowe/python-gitlab.git HEAD:mainEnumerating objects: 11, done.Counting objects: 100% (11/11), done.Delta compression using up to 8 threadsCompressing objects: 100% (6/6), done.Writing objects: 100% (6/6), 808 bytes | 808.00 KiB/s, done.Total 6 (delta 5), reused 0 (delta 0), pack-reused 0remote: Resolving deltas: 100% (5/5), completed with 5 local objects.To github.com:walterrowe/python-gitlab.git + 16a051a...24b720e HEAD -> main (forced update)
walterrowe reacted with thumbs up emoji

@JohnVillalovosJohnVillalovos changed the title[doc] documentation updates to reflect addition of mutually exclusive attributesdoc: documentation updates to reflect addition of mutually exclusive attributesJun 6, 2022
@JohnVillalovosJohnVillalovos changed the titledoc: documentation updates to reflect addition of mutually exclusive attributesdoc:s documentation updates to reflect addition of mutually exclusive attributesJun 6, 2022
@nejchnejch changed the titledoc:s documentation updates to reflect addition of mutually exclusive attributesdocs: update docs to reflect addition of mutually exclusive attributesJun 6, 2022
@nejchnejch merged commit0f607f6 intopython-gitlab:mainJun 6, 2022
@nejch
Copy link
Member

Thanks again for the PR@walterrowe, I realized after merge we have some more issues with this so I opened a follow-up in#2060. If you see any more issues feel free to open a PR! :)

Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@nejchnejchnejch left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

3 participants
@walterrowe@JohnVillalovos@nejch

[8]ページ先頭

©2009-2025 Movatter.jp