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.

Sign up for GitHub

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

Jump to bottom

Cherry-Pick to return the conflict files #5507

Open
itaiad200 opened this issue Mar 16, 2023 · 1 comment
Open

Cherry-Pick to return the conflict files #5507

itaiad200 opened this issue Mar 16, 2023 · 1 comment
Labels
good first issue Good for newcomers no stale Using this label will prevent items from being marked as stale team/versioning-engine Team versioning engine

Comments

@itaiad200
Copy link
Contributor

There's no equivalent diff to perform so it's hard for the user to figure out the conflicting files.
@itaiad200 itaiad200 added the team/versioning-engine Team versioning engine label Mar 16, 2023
@itaiad200 itaiad200 mentioned this issue Mar 16, 2023
Merged
@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 1, 2023

This issue is now marked as stale after 90 days of inactivity, and will be closed soon. To keep it, mark it with the "no stale" label.

@github-actions github-actions bot added the stale label Nov 1, 2023
@itaiad200 itaiad200 added no stale Using this label will prevent items from being marked as stale and removed stale labels Nov 2, 2023
@github-actions github-actions bot added the stale label Mar 20, 2024
@arielshaqed arielshaqed removed the stale label Mar 27, 2024
@itaiad200 itaiad200 added the good first issue Good for newcomers label Jun 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
good first issue Good for newcomers no stale Using this label will prevent items from being marked as stale team/versioning-engine Team versioning engine
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@arielshaqed @itaiad200