Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

msggen: add disableoffer method#7233

Merged
cdecker merged 1 commit intoElementsProject:masterElementsProject/lightning:masterfrom
daywalker90:disableofferdaywalker90/lightning:disableofferCopy head branch name to clipboard
Apr 25, 2024
Merged

msggen: add disableoffer method#7233
cdecker merged 1 commit intoElementsProject:masterElementsProject/lightning:masterfrom
daywalker90:disableofferdaywalker90/lightning:disableofferCopy head branch name to clipboard

Conversation

@daywalker90
Copy link
Collaborator

Based on the fixes from #7215 + #7217 + #7218 and #7230

@daywalker90 daywalker90 requested a review from cdecker as a code owner April 17, 2024 10:21
@cdecker cdecker added this to the v24.05 milestone Apr 22, 2024
@cdecker
Copy link
Member

cdecker commented Apr 22, 2024

This needs a rebase on top of master and then its good to go.

@daywalker90
Copy link
Collaborator Author

rebased on master

@cdecker
Copy link
Member

cdecker commented Apr 25, 2024

Rebased, and resolved a bunch of conflicts. The many tiny PR idea is nice, but just does not work if there are conflicts that rebasing brings in. In order for that to work we'd have to have a way to stack the PRs one on top of the other, which GH does not support at all atm for external contributors.

@daywalker90
Copy link
Collaborator Author

😢

@cdecker
Copy link
Member

cdecker commented Apr 25, 2024

Ah no worries, I love your contributions, I'm just revising my own mental model on what the ideal flow would be. No criticism intended 🤗

@daywalker90
Copy link
Collaborator Author

None taken, it was directed at Github. I tried stacking them all on top of each other in the beginning but you indeed still had to rebase with conflicts every time iirc.

@cdecker cdecker force-pushed the disableoffer branch 2 times, most recently from 81589c3 to 4ef003e Compare April 25, 2024 11:28
@cdecker
Copy link
Member

cdecker commented Apr 25, 2024

Ok, I butchered this PR trying to stack them. I'll reset to your latest version.

@cdecker
Copy link
Member

cdecker commented Apr 25, 2024

Ok, I messed up stacking them, the code was added in #7256, so this is just regenerating the grpc files.

@cdecker cdecker enabled auto-merge (rebase) April 25, 2024 11:35
@cdecker cdecker merged commit dc099a0 into ElementsProject:master Apr 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.