continuwuation/ruwuma
5
0
Fork 0
Code Issues Pull requests 2 Projects Releases Packages Wiki Activity Actions

WIP: Draft: Allow invalid predecessor #13

Draft
morguldir wants to merge 1 commit from morguldir/invalid-predecessor into conduwuit-changes
pull from: morguldir/invalid-predecessor
merge into: continuwuation:conduwuit-changes
Conversation 0 Commits 1 Files changed 2 +42 -1
morguldir commented 2024-09-25 10:43:03 +00:00 (Migrated from github.com)
Copy link
<!-- PR checklist, not strictly necessary but generally useful unless you're just fixing a typo or something like that: - Run `cargo xtask ci` locally before posting the PR - Documented public API changes in CHANGELOG.md files -->
This pull request has changes conflicting with the target branch.
  • crates/ruma-events/Cargo.toml
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin morguldir/invalid-predecessor:morguldir/invalid-predecessor
git checkout morguldir/invalid-predecessor

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout conduwuit-changes
git merge --no-ff morguldir/invalid-predecessor
git checkout morguldir/invalid-predecessor
git rebase conduwuit-changes
git checkout conduwuit-changes
git merge --ff-only morguldir/invalid-predecessor
git checkout morguldir/invalid-predecessor
git rebase conduwuit-changes
git checkout conduwuit-changes
git merge --no-ff morguldir/invalid-predecessor
git checkout conduwuit-changes
git merge --squash morguldir/invalid-predecessor
git checkout conduwuit-changes
git merge --ff-only morguldir/invalid-predecessor
git checkout conduwuit-changes
git merge morguldir/invalid-predecessor
git push origin conduwuit-changes
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

Something isn't working

  
documentation

Improvements or additions to documentation

  
duplicate

This issue or pull request already exists

  
enhancement

New feature or request

  
good first issue

Good for newcomers

  
help wanted

Extra attention is needed

  
invalid

This doesn't seem right

  
question

Further information is requested

  
wontfix

This will not be worked on

No labels
bug
documentation
duplicate
enhancement
good first issue
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: continuwuation/ruwuma#13
No description provided.
Delete branch "morguldir/invalid-predecessor"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?