Conversation
5 tasks
PastaPastaPasta
added a commit
to dashpay/dash
that referenced
this pull request
Oct 24, 2024
…` action 8865686 fix: adjust conditions in `Check Merge Fast-Forward Only` action (UdjinM6) Pull request description: ## Issue being fixed or feature implemented I _think_ we were using the wrong event name since #6190... which is why #6341 is failing atm. ``` V Run git fetch origin master:master git fetch origin master:master git checkout master if [ "pull_request_target" == "pull_request" ]; then git merge --ff-only 0172b88 else git merge --ff-only d494339 fi ``` https://github.com/dashpay/dash/actions/runs/11474383519/job/31930192140?pr=6341 ## What was done? ## How Has This Been Tested? Pushed these changes to my `develop` https://github.com/UdjinM6/dash/commits/develop/ Created 2 PRs to verify it worked as expected: - UdjinM6#18 - UdjinM6#19 ## Breaking Changes n/a ## Checklist: - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ Top commit has no ACKs. Tree-SHA512: fb38b671d072b802eda0cd012df805cfb875e537b3049ee4b254af0b2763ad12e916972509899948d71910ca439c036d63b678e26761ad111e63b65d5e824a2b
|
This pull request has conflicts, please rebase. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.