-
Notifications
You must be signed in to change notification settings - Fork 464
keep knowledge of ongoing merges across merge pipelines #5633
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
trinity-1686a
wants to merge
11
commits into
main
Choose a base branch
from
trinity/recover-forgotten-merges
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
9e1ab35
track merges accross pipelines
trinity-1686a 1299985
test no double merge after pipeline restart
trinity-1686a 100d400
improve test
trinity-1686a f63f24d
add test to tracker
trinity-1686a 1972bb3
Merge branch main into trinity/recover-forgotten-merges
trinity-1686a 074fbc6
increase sleep time, fixing a flaky test
trinity-1686a 1826849
add sleep time, fixing another flaky test
trinity-1686a ae99e04
typo
trinity-1686a 0200e63
make RecordUnacknowledgedDrop::acknoledge() consume values
trinity-1686a c60607d
fix some flaky tests
trinity-1686a 2a6f742
add license header
trinity-1686a File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
typo
- Loading branch information
commit ae99e044f9fa139e72f05987cc06cd31554b7ef9
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.