brew pr-pull #13
Annotations
2 errors
|
pr-pull
Process completed with exit code 1.
|
|
pr-pull
Failure while executing; `/home/linuxbrew/.linuxbrew/Homebrew/Library/Homebrew/shims/shared/git -C /home/linuxbrew/.linuxbrew/Homebrew/Library/Taps/timvw/homebrew-tap cherry-pick --ff --allow-empty 99694bebda49d65b4714c95e2dde82efae8fd0c0 ff6124672bab911aabed04d7e72ca85a63be451f 33c8a5d2e982e92e6a58a4c4ef17cf4d2e6d4fd2` exited with 0. Here's the output:
Auto-merging Formula/bose.rb
CONFLICT (content): Merge conflict in Formula/bose.rb
error: could not apply 99694be... chore(deps): update dependency timvw/bose to v0.2.2
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
|