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

fix: push and pull conflicts not shown #5498

Merged
merged 1 commit into from
Mar 12, 2024
Merged

fix: push and pull conflicts not shown #5498

merged 1 commit into from
Mar 12, 2024

Conversation

CristiCanizales
Copy link
Contributor

What does this PR do?

  • Fixes display of conflicts for push and pull commands

What issues does this PR fix or reference?

@W-14717018@

Functionality Before

  • No conflicts shown in output table upon conflicts

Functionality After

  • Conflicts correctly shown in output table upon conflicts

@CristiCanizales CristiCanizales self-assigned this Mar 12, 2024
@CristiCanizales CristiCanizales requested a review from a team as a code owner March 12, 2024 16:03
daphne-sfdc
daphne-sfdc approved these changes Mar 12, 2024
View reviewed changes
Copy link
Contributor

@daphne-sfdc daphne-sfdc left a comment

Choose a reason for hiding this comment

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

Approved! 🎉

Conflict case for push ✅
Screenshot 2024-03-12 at 12 20 39 PM

Conflict case for pull ✅
Screenshot 2024-03-12 at 12 15 23 PM

Error case for push ✅
Screenshot 2024-03-12 at 12 16 03 PM

Push and pull sunny day cases and ignore conflicts all work as expected ✅

@CristiCanizales CristiCanizales merged commit 8cb4d5c into develop Mar 12, 2024
12 checks passed
@CristiCanizales CristiCanizales deleted the cristi/fix-conflicts branch March 12, 2024 16:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peternhale peternhale peternhale approved these changes

@daphne-sfdc daphne-sfdc daphne-sfdc approved these changes

Assignees

@CristiCanizales CristiCanizales

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@CristiCanizales @peternhale @daphne-sfdc