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

New package: yacy-1.924 #35810

Closed

jason1987d wants to merge 1 commit into void-linux:master from jason1987d:yacy

Contributor

jason1987d commented Feb 23, 2022 •

edited

I tested the changes in this PR: YES
This new package conforms to the quality requirements: YES
I built this PR locally for my native architecture, (x86_64-LIBC)

Contributor

tibequadorian commented Feb 23, 2022

Use rebase instead of merge to keep it one single commit.

paper42 added the new-package label

Contributor Author

jason1987d commented Feb 24, 2022

Use rebase instead of merge to keep it one single commit.

What is the recommended set of commands to do so? I've found documentation on this but it's not removing that merge commit.

Contributor

tibequadorian commented Feb 24, 2022

For updating branches without a merge commit you can use git pull --rebase upstream master as described in https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#getting-your-packages-into-void-by-yourself

I recommend reading https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History

zen0bit approved these changes

View reviewed changes

Contributor

zen0bit left a comment

Looks good to me, tested, builded, using it...


          New package: yacy-1.924

db7f79b

jason1987d closed this

jason1987d deleted the yacy branch

June 20, 2022 18:51

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment