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

Improvements to pr review script #1118

Merged
merged 1 commit into from
Feb 14, 2023
Merged

Improvements to pr review script #1118

merged 1 commit into from
Feb 14, 2023

Conversation

gwillen
Copy link
Contributor

@gwillen gwillen commented Jun 8, 2022

Improve the merge PR review script (for handling merges between upstream bitcoin core and elements) in a bunch of ways, including:

  • More types of diffs to optionally look at
  • Better handling of non-merge fixup commits
  • Handling of new types of Bitcoin Core merge commits

apoelstra
apoelstra approved these changes Jun 8, 2022
View reviewed changes
Copy link
Member

@apoelstra apoelstra left a comment

Choose a reason for hiding this comment

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

utACK, these changes all look good.

@gwillen gwillen merged commit 718ac5b into ElementsProject:master Feb 14, 2023
@psgreco psgreco mentioned this pull request Feb 24, 2023
Merged
jamesdorfman added a commit to jamesdorfman/elements that referenced this pull request Mar 13, 2023
@jamesdorfman
Merge 718ac5b into merged_master (Elements PR ElementsProject#1118)
371d15d
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@apoelstra apoelstra apoelstra approved these changes

@Capi5879 Capi5879 Capi5879 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.
3 participants
@gwillen @apoelstra @Capi5879