Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Have cherry pick workflow handle conflicts #259

Merged
merged 1 commit into from
May 4, 2023
Merged

Have cherry pick workflow handle conflicts #259

merged 1 commit into from
May 4, 2023

Conversation

andrewsavage1
Copy link
Contributor

kaidokert
kaidokert approved these changes May 4, 2023
View reviewed changes
Copy link
Member

@kaidokert kaidokert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like a solution to me, great work !

@andrewsavage1 andrewsavage1 merged commit dad1b8d into youtube:main May 4, 2023
281 checks passed
@andrewsavage1 andrewsavage1 deleted the feature/cp-with-conflict branch May 4, 2023 17:35
@andrewsavage1 andrewsavage1 added cp-23.lts.1+ Cherry Pick to the 23.lts.1+ branch cp-22.lts.1+ Cherry Pick to the 22.lts.1+ branch cp-21.lts.1+ Cherry Pick to the 21.lts.1+ branch cp-20.lts.1+ Cherry Pick to the 20.lts.1+ branch cp-19.lts.1+ Cherry Pick to the 19.lts.1+ branch cp-19.android.1+ cp-rc_11 Cherry Pick to the rc_11 branch cp-COBALT_9 Cherry Pick to the COBALT_9 branch labels May 4, 2023
@cobalt-github-releaser-bot cobalt-github-releaser-bot mentioned this pull request May 4, 2023
Merged
cobalt-github-releaser-bot pushed a commit that referenced this pull request May 4, 2023
@andrewsavage1 @anonymous1-me
Have cherry pick workflow handle conflicts (#259)
95d2c30 
b/279224773

(cherry picked from commit dad1b8d)
andrewsavage1 added a commit that referenced this pull request May 4, 2023
@cobalt-github-releaser-bot @andrewsavage1
Have cherry pick workflow handle conflicts (#259) (#263)
06d5818 
b/279224773

(cherry picked from commit dad1b8d)

Co-authored-by: andrewsavage1 <andrewsavage@google.com>
This was referenced May 4, 2023
Merged
Merged
cobalt-github-releaser-bot pushed a commit that referenced this pull request May 4, 2023
@andrewsavage1 @anonymous1-me
Have cherry pick workflow handle conflicts (#259)
8f2ae28 
b/279224773

(cherry picked from commit dad1b8d)
cobalt-github-releaser-bot pushed a commit that referenced this pull request May 4, 2023
@andrewsavage1 @anonymous1-me
Have cherry pick workflow handle conflicts (#259)
4d6b3cd 
b/279224773

(cherry picked from commit dad1b8d)
@cobalt-github-releaser-bot cobalt-github-releaser-bot mentioned this pull request May 4, 2023
Merged
cobalt-github-releaser-bot pushed a commit that referenced this pull request May 4, 2023
@andrewsavage1 @anonymous1-me
Have cherry pick workflow handle conflicts (#259)
7cf6a79 
b/279224773

(cherry picked from commit dad1b8d)
@cobalt-github-releaser-bot cobalt-github-releaser-bot mentioned this pull request May 4, 2023
Merged
cobalt-github-releaser-bot pushed a commit that referenced this pull request May 4, 2023
@andrewsavage1 @anonymous1-me
Have cherry pick workflow handle conflicts (#259)
7a2138e 
b/279224773

(cherry picked from commit dad1b8d)
@cobalt-github-releaser-bot cobalt-github-releaser-bot mentioned this pull request May 4, 2023
Merged
cobalt-github-releaser-bot pushed a commit that referenced this pull request May 4, 2023
@andrewsavage1 @anonymous1-me
Have cherry pick workflow handle conflicts (#259)
cf73a7c 
b/279224773

(cherry picked from commit dad1b8d)
@cobalt-github-releaser-bot cobalt-github-releaser-bot mentioned this pull request May 4, 2023
Merged
cobalt-github-releaser-bot pushed a commit that referenced this pull request May 4, 2023
@andrewsavage1 @anonymous1-me
Have cherry pick workflow handle conflicts (#259)
e84681c 
b/279224773

(cherry picked from commit dad1b8d)
andrewsavage1 added a commit that referenced this pull request May 4, 2023
@cobalt-github-releaser-bot @andrewsavage1
Have cherry pick workflow handle conflicts (#259) (#264)
3e230b2 
b/279224773

(cherry picked from commit dad1b8d)

Co-authored-by: andrewsavage1 <andrewsavage@google.com>
andrewsavage1 added a commit that referenced this pull request May 4, 2023
@cobalt-github-releaser-bot @andrewsavage1
Have cherry pick workflow handle conflicts (#259) (#269)
eff5367 
b/279224773

(cherry picked from commit dad1b8d)

Co-authored-by: andrewsavage1 <andrewsavage@google.com>
andrewsavage1 added a commit that referenced this pull request May 4, 2023
@cobalt-github-releaser-bot @andrewsavage1
Have cherry pick workflow handle conflicts (#259) (#268)
43b0753 
b/279224773

(cherry picked from commit dad1b8d)

Co-authored-by: andrewsavage1 <andrewsavage@google.com>
andrewsavage1 added a commit that referenced this pull request May 4, 2023
@cobalt-github-releaser-bot @andrewsavage1
Have cherry pick workflow handle conflicts (#259) (#265)
9be7802 
b/279224773

(cherry picked from commit dad1b8d)

Co-authored-by: andrewsavage1 <andrewsavage@google.com>
andrewsavage1 added a commit that referenced this pull request May 4, 2023
@cobalt-github-releaser-bot @andrewsavage1
Have cherry pick workflow handle conflicts (#259) (#266)
26b86f9 
b/279224773

(cherry picked from commit dad1b8d)

Co-authored-by: andrewsavage1 <andrewsavage@google.com>
andrewsavage1 added a commit that referenced this pull request May 4, 2023
@cobalt-github-releaser-bot @andrewsavage1
Have cherry pick workflow handle conflicts (#259) (#267)
60be022 
b/279224773

(cherry picked from commit dad1b8d)

Co-authored-by: andrewsavage1 <andrewsavage@google.com>
@andrewsavage1 andrewsavage1 added cp-21.lts.1+ Cherry Pick to the 21.lts.1+ branch and removed cp-21.lts.1+ Cherry Pick to the 21.lts.1+ branch labels May 5, 2023
@cobalt-github-releaser-bot cobalt-github-releaser-bot mentioned this pull request May 5, 2023
Merged
cobalt-github-releaser-bot pushed a commit that referenced this pull request May 5, 2023
@andrewsavage1 @anonymous1-me
Have cherry pick workflow handle conflicts (#259)
a65086d 
b/279224773

(cherry picked from commit dad1b8d)
andrewsavage1 added a commit that referenced this pull request May 5, 2023
@cobalt-github-releaser-bot @andrewsavage1
Have cherry pick workflow handle conflicts (#259) (#275)
75d41b8 
b/279224773

(cherry picked from commit dad1b8d)

Co-authored-by: andrewsavage1 <andrewsavage@google.com>
dmytro-golovchenko-luminartech pushed a commit to dmytro-golovchenko-luminartech/cobalt that referenced this pull request Jun 22, 2023
@cobalt-github-releaser-bot @andrewsavage1
Have cherry pick workflow handle conflicts (youtube#259) (youtube#266)
e16b08f 
b/279224773

(cherry picked from commit 8649250 [formerly dad1b8d])

Co-authored-by: andrewsavage1 <andrewsavage@google.com>
Former-commit-id: 26b86f9
dmytro-golovchenko-luminartech pushed a commit to dmytro-golovchenko-luminartech/cobalt that referenced this pull request Jun 22, 2023
@cobalt-github-releaser-bot @andrewsavage1
Have cherry pick workflow handle conflicts (youtube#259) (youtube#264)
02409e9 
b/279224773

(cherry picked from commit 8649250 [formerly dad1b8d])

Co-authored-by: andrewsavage1 <andrewsavage@google.com>
Former-commit-id: 3e230b2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kaidokert kaidokert kaidokert approved these changes

@isarkis isarkis isarkis approved these changes

Assignees
No one assigned
Labels
cp-19.lts.1+ Cherry Pick to the 19.lts.1+ branch cp-20.lts.1+ Cherry Pick to the 20.lts.1+ branch cp-21.lts.1+ Cherry Pick to the 21.lts.1+ branch cp-22.lts.1+ Cherry Pick to the 22.lts.1+ branch cp-23.lts.1+ Cherry Pick to the 23.lts.1+ branch cp-COBALT_9 Cherry Pick to the COBALT_9 branch cp-rc_11 Cherry Pick to the rc_11 branch
Projects
None yet
Milestone
No milestone
3 participants
@andrewsavage1 @kaidokert @isarkis