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.

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

fix(command-compile): rebase before compiling and fetch origin #289

Merged
merged 5 commits into from
Feb 2, 2024

Conversation

skjnldsv
Copy link
Member

@skjnldsv skjnldsv commented Feb 1, 2024

/compile
/compile amend /
/compile fixup /
/compile rebase-amend /
/compile rebase-fixup /

Note

PS: it will NOT resolve conflicts for you (could be amazing to drop any conflicts on /js or /dist)

References

  1. Chore(deps): Bump @nextcloud/router from 2.2.0 to 2.2.1 privacy#1022 (comment)
  2. https://github.com/nextcloud/privacy/actions/runs/7740264658?pr=1022

@skjnldsv skjnldsv self-assigned this Feb 1, 2024
@skjnldsv skjnldsv added the 3. to review Waiting for reviews label Feb 1, 2024
@nickvergessen
Copy link
Member

/compile rebase / also works?

@skjnldsv
Copy link
Member Author

skjnldsv commented Feb 1, 2024

/compile rebase / also works?

should be yes

PS: it will NOT resolve conflicts for you (could be amazing to drop any conflicts on /js or /dist)

@skjnldsv
Copy link
Member Author

skjnldsv commented Feb 1, 2024

@skjnldsv
Copy link
Member Author

skjnldsv commented Feb 2, 2024

should be yes

No, because we need a force push then

Test: https://github.com/nextcloud/privacy/actions/runs/7752377622/job/21141774891?pr=1026
EDIT: works! 🚀

@skjnldsv
Copy link
Member Author

skjnldsv commented Feb 2, 2024

Here you go @nickvergessen !

@skjnldsv skjnldsv merged commit ebe422a into master Feb 2, 2024
3 checks passed
@skjnldsv skjnldsv deleted the skjnldsv-patch-1 branch February 2, 2024 07:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants