🚨 Hotfix merge conflicts #8270
Open
🚨 Hotfix merge conflicts #8270
+1,098
−248
Conversation
This file contains 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
![live-github-bot[bot]](https://avatars.githubusercontent.com/in/198164?s=60&v=4){kind=small}
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
4 Skipped Deployments
|
live-github-bot
bot
added
desktop
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The hotfix had some merge conflicts 🚨
This pull request was created in order to resolve the merge conflicts between the hotfix and develop branches.
git checkout develop && git pull git checkout support/hotfix-merge-conflicts git merge developChecklist
To be ready to be merged, we must comply with all theses checks: