trinity-1686a/garage
2
0
Fork 0
forked from Deuxfleurs/garage
Code Issues Pull requests 1 Projects Releases Wiki Activity

wip: use netapp streaming #1

Draft
trinity-1686a wants to merge 1 commit from netapp-streams into main
pull from: netapp-streams
merge into: trinity-1686a:main
Conversation 0 Commits 1 Files changed 17 +216 -51
trinity-1686a commented 2022-06-08 08:59:16 +00:00
Owner
Copy link

see netapp#1

see [netapp#1](https://git.deuxfleurs.fr/trinity-1686a/netapp/pulls/1)
trinity-1686a added 1 commit 2022-06-08 08:59:17 +00:00
This pull request has changes conflicting with the target branch.
  • src/block/manager.rs
  • src/model/helper/error.rs
  • src/rpc/rpc_helper.rs
  • src/table/sync.rs
  • src/block/Cargo.toml
  • src/block/block.rs
  • src/garage/cli/structs.rs
  • src/util/Cargo.toml
  • Cargo.lock
  • src/garage/admin.rs
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin netapp-streams:netapp-streams
git checkout netapp-streams

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 main
git merge --no-ff netapp-streams
git checkout netapp-streams
git rebase main
git checkout main
git merge --ff-only netapp-streams
git checkout netapp-streams
git rebase main
git checkout main
git merge --no-ff netapp-streams
git checkout main
git merge --squash netapp-streams
git checkout main
git merge --ff-only netapp-streams
git checkout main
git merge netapp-streams
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
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: trinity-1686a/garage#1
No description provided.
Delete branch "netapp-streams"

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?