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

Require merging external repo changes through a ticket branch #695

Merged
merged 1 commit into from
Sep 16, 2024
Merged

Require merging external repo changes through a ticket branch #695

merged 1 commit into from
Sep 16, 2024

Conversation

arunkannawadi
Copy link
Member

No description provided.

@arunkannawadi arunkannawadi requested a review from ktlim September 9, 2024 15:38
ktlim
ktlim approved these changes Sep 16, 2024
View reviewed changes
Copy link
Contributor

@ktlim ktlim left a comment

Choose a reason for hiding this comment

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

I'm a little worried that this is kind of fiddly and that --rebase-merges might get forgotten, but it's probably the best we can do for now, and the net differences between lsst-dev and the default upstream are always available in the GitHub UI.

@arunkannawadi
Require merging external repo changes
467224b 
through a ticket branch.
@arunkannawadi arunkannawadi force-pushed the u/arunkannawadi/DM-46049 branch from 77ebb6e to 467224b Compare September 16, 2024 17:28
@arunkannawadi arunkannawadi merged commit f68d2db into main Sep 16, 2024
3 checks passed
@arunkannawadi arunkannawadi deleted the u/arunkannawadi/DM-46049 branch September 16, 2024 17:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ktlim ktlim ktlim approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@arunkannawadi @ktlim