Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(migrations): Add newlines between each app in the lockfile #81157

Merged
merged 2 commits into from
Nov 22, 2024

Conversation

wedamija
Copy link
Member

When two adjacent lines in the lockfile are changed git/github detects a merge conflict. An easy work around is to just add newlines in between each application

@wedamija wedamija requested review from saponifi3d and a team November 21, 2024 21:32
@wedamija wedamija enabled auto-merge (squash) November 21, 2024 21:32
@github-actions github-actions bot added the Scope: Backend Automatically applied to PRs that change backend components label Nov 21, 2024
Copy link
Contributor

@saponifi3d saponifi3d left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:yay:!! --conflicts;

When two adjacent lines in the lockfile are changed git/github detects a merge conflict. An easy work around is to just add newlines in between each application
@wedamija wedamija force-pushed the danf/migrations-lockfile-newlines branch from bec80b0 to f6de5e5 Compare November 22, 2024 00:12
@wedamija wedamija merged commit a875e05 into master Nov 22, 2024
49 checks passed
@wedamija wedamija deleted the danf/migrations-lockfile-newlines branch November 22, 2024 00:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Scope: Backend Automatically applied to PRs that change backend components
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants