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

[Bug]: dicard & pull fails when conflict #38238

Open
1 task done
bgadrian opened this issue Dec 18, 2024 · 1 comment
Open
1 task done

[Bug]: dicard & pull fails when conflict #38238

bgadrian opened this issue Dec 18, 2024 · 1 comment
Assignees
@Nikhil-Nandagopal @pranavkanade
Labels
Bug Something isn't working Community Reported issues reported by community members Needs More Info Needs additional information Needs Triaging Needs attention from maintainers to triage Production

Comments

@bgadrian
Copy link

bgadrian commented Dec 18, 2024 •
edited
Loading

Is there an existing issue for this?

  • I have searched the existing issues

Description

When trying to pull & discard fails with

git discard changes failed. Details: Please create a new branch and resolve the conflicts on remote repository before proceeding ahead.

Creating a new branch is not possible on CE so the message is misleading.

A feature like git reset --hard #34463 will also help us to fix this issue.

Steps To Reproduce

Produce a conflict between the local master and remote
discard & pull

Public Sample App

No response

Environment

Production

Severity

Critical (Broken Production apps)

Issue video log

No response

Version

Self-hosted: 1.48
@bgadrian bgadrian added Bug Something isn't working Needs Triaging Needs attention from maintainers to triage labels Dec 18, 2024
@Nikhil-Nandagopal Nikhil-Nandagopal added Community Reported issues reported by community members Critical This issue needs immediate attention. Drop everything else Production and removed Critical This issue needs immediate attention. Drop everything else labels Dec 18, 2024
@Nikhil-Nandagopal
Copy link
Contributor

@bgadrian creating a new branch is certainly possible on CE. What is the issue you are facing?

@Nikhil-Nandagopal Nikhil-Nandagopal added the Needs More Info Needs additional information label Dec 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@Nikhil-Nandagopal Nikhil-Nandagopal

@pranavkanade pranavkanade

Labels
Bug Something isn't working Community Reported issues reported by community members Needs More Info Needs additional information Needs Triaging Needs attention from maintainers to triage Production
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@bgadrian @Nikhil-Nandagopal @pranavkanade