Skip to content

Update docs to reflect that you can join calls without the labs flags#28113

Merged
robintown merged 1 commit into
element-hq:developfrom
robintown:delabs-join-calls
Sep 30, 2024
Merged

Update docs to reflect that you can join calls without the labs flags#28113
robintown merged 1 commit into
element-hq:developfrom
robintown:delabs-join-calls

Conversation

@robintown
Copy link
Copy Markdown
Member

@robintown robintown added the T-Task Tasks for the team like planning label Sep 27, 2024
@robintown robintown requested a review from a team as a code owner September 27, 2024 18:11
@robintown robintown added this pull request to the merge queue Sep 30, 2024
Merged via the queue into element-hq:develop with commit e428a1e Sep 30, 2024
@robintown robintown deleted the delabs-join-calls branch September 30, 2024 13:55
@dbkr dbkr added the backport staging Label to automatically backport PR to staging branch label Oct 1, 2024
@RiotRobot
Copy link
Copy Markdown
Contributor

The backport to staging failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-staging staging
# Navigate to the new working tree
cd .worktrees/backport-staging
# Create a new branch
git switch --create backport-28113-to-staging
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e428a1eb536bce454b78fb02e55f061762dd7d2d
# Push it to GitHub
git push --set-upstream origin backport-28113-to-staging
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-staging

Then, create a pull request where the base branch is staging and the compare/head branch is backport-28113-to-staging.

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

Labels

backport staging Label to automatically backport PR to staging branch T-Task Tasks for the team like planning

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants