Skip to content

write out the generated UUID for sending to support#12134

Closed
tarzanek wants to merge 0 commit intoscylladb:masterfrom
tarzanek:patch-2
Closed

write out the generated UUID for sending to support#12134
tarzanek wants to merge 0 commit intoscylladb:masterfrom
tarzanek:patch-2

Conversation

@tarzanek
Copy link
Copy Markdown
Contributor

@tzach can you approve?

@avikivity
Copy link
Copy Markdown
Member

We don't merge patches into branches (causes an immediate regression in master).

@tarzanek
Copy link
Copy Markdown
Contributor Author

how can this be merged then (sorry for my ignorance, I only pressed "edit this page" on the docs page and this came out of it 😉 )?

can someone retarget it?
or what to do now?

@avikivity
Copy link
Copy Markdown
Member

how can this be merged then (sorry for my ignorance, I only pressed "edit this page" on the docs page and this came out of it wink )?

can someone retarget it? or what to do now?

Start over without "edit this page".

@mykaul
Copy link
Copy Markdown
Contributor

mykaul commented Nov 29, 2022

how can this be merged then (sorry for my ignorance, I only pressed "edit this page" on the docs page and this came out of it wink )?
can someone retarget it? or what to do now?

Start over without "edit this page".

@annastuchlik @tzach we should remove that useless button from our docs. The flow doesn't work, as it doesn't allow commit to your own fork and from there create a proper PR.

@tzach
Copy link
Copy Markdown
Contributor

tzach commented Nov 29, 2022

The Edit button does use a fork and allows you to set the branch you want to merge to, including master.
The default is the branch you are currently reading (see capture below).

We just moved latest from master to 5.1 , which explains why we have not seen this mistake before.

@dgarcia360, let's look for a solution.
We can keep the Edit just in master pages, but it will reduce contributions.

@tarzanek you can try Edit from the master version of the page
docs/troubleshooting/report-scylla-problem.rst

image

@tzach
Copy link
Copy Markdown
Contributor

tzach commented Nov 29, 2022

We can keep the Edit just in master pages, but it will reduce contributions.

Or, we can have the Edit to always send you to edit the master version of the page
(might be a problem if the page was renamed)

@tarzanek tarzanek changed the base branch from branch-5.1 to master December 2, 2022 10:28
@tarzanek
Copy link
Copy Markdown
Contributor Author

tarzanek commented Dec 2, 2022

oh wow, retargeting to master caused a balagan! :-D

@tarzanek
Copy link
Copy Markdown
Contributor Author

tarzanek commented Dec 2, 2022

ok, it's a mess, confirming this flow creates more problems than it solves

BUT I loved how quickly I edited the doc page ...

@tarzanek tarzanek deleted the patch-2 branch December 2, 2022 10:32
@tarzanek
Copy link
Copy Markdown
Contributor Author

tarzanek commented Dec 2, 2022

tried again cleanly:
#12176

so yes, against master it works

@annastuchlik
Copy link
Copy Markdown
Collaborator

@tarzanek I'm sorry this problem emerged when you were contributing. 5.1 is the first release when the documentation is versioned, and the "latest stable version" is not master, so we weren't aware of it.

Still, I think we should try to find a solution to that problem to make editing pages very easy.

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.

5 participants