You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Yarn has built in resolution if you encounter a merge conflict that works great.
If you have a merge conflict in yarn.lock in a pull request in GitHub, you still need to checkout the branch locally, merge in the main branch and resolve the conflict, which isn't very nice when it happens often, like in an active repository.
We currently have an auto fixer command in our repository that runs the following if you tell it to /fix yarn.
reacted with thumbs up emoji reacted with thumbs down emoji reacted with laugh emoji reacted with hooray emoji reacted with confused emoji reacted with heart emoji reacted with rocket emoji reacted with eyes emoji
-
Yarn has built in resolution if you encounter a merge conflict that works great.
If you have a merge conflict in yarn.lock in a pull request in GitHub, you still need to checkout the branch locally, merge in the main branch and resolve the conflict, which isn't very nice when it happens often, like in an active repository.
We currently have an auto fixer command in our repository that runs the following if you tell it to
/fix yarn
.And commits and pushes to the branch.
Would this (excluding the push) make sense as a yarn plugin, like
yarn stage
?Beta Was this translation helpful? Give feedback.
All reactions