search

guardian / homebrew-devtools

A homebrew tap containing dev tools for the Guardian
2 stars 3 forks source link

Perform `git status` #92

Closed akash1810 closed 1 year ago

akash1810 commented 1 year ago

What does this change?

The build log of #88 contains:

error: could not apply 1728e63... Merge 0da6e2d72a155a4802c6dd09262f749ac997fa03 into 02dd55250ec66d58337ac276f718186ac0c8a059
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 1728e63... Merge 0da6e2d72a155a4802c6dd09262f749ac997fa03 into 02dd55250ec66d58337ac276f718186ac0c8a059

Unsure why, let's perform git status to narrow the cause down.

How to test

See CI.

akash1810 commented 1 year ago

Attaching the build log of this branch for prosperity - logs_85.zip