Merge conflict
#937
-
|
https://github.com/ShayBox/ShayBox/tree/master/.github/workflows How do I fix these merge conflict errors with actions/checkout@v3? |
Beta Was this translation helpful? Give feedback.
Answered by
ShayBox
Oct 5, 2022
Replies: 2 comments
-
|
--
All the best
Christian Fr stormyhr Monday, 03 October 2022, 02:47am +02:00 from Shayne Hartford ***@***.*** :
…
https://github.com/ShayBox/ShayBox/tree/master/.github/workflows
https://github.com/ShayBox/ShayBox/actions/runs/3170734489/jobs/5163533693
How do I fix these merge conflict errors with ***@***.***?
There shouldn't be anything to conflict, it's just updating a single file...
—
Reply to this email directly, view it on GitHub , or unsubscribe .
You are receiving this because you are subscribed to this thread. Message ID: @ github . com>
|
Beta Was this translation helpful? Give feedback.
0 replies
-
|
I figured it out, you have to force push |
Beta Was this translation helpful? Give feedback.
0 replies
Answer selected by
ShayBox
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
I figured it out, you have to force push