Cherry pick doesnot work when we have conflicts!

desktop / desktop

Focus on what matters instead of fighting with Git.

https://desktop.github.com

MIT License

19.49k stars 9.32k forks source link

Cherry pick doesnot work when we have conflicts! #17036

Open Shivareddy-Aluri opened 1 year ago

Shivareddy-Aluri commented 1 year ago

The problem

Prerequisite: simulate a situation where you will get conflicts on cherry picking a commit from branch A to branch B.

users are shown the conflict message on doing a cherrypick. i can even resolve the conflicts but right after resolving the conflicts branch sets back to "branch A". ideally it should set to branch B with conflicts resolved.

Release version

Version 3.2.4 (x64)

Operating system

Mac ventura

Steps to reproduce the behavior

No response

Log files

No response

Screenshots

No response

Additional context

No response

tidy-dev commented 1 year ago

Confirmed and it is a stacked popover regression. We need to close a popover at one of the transition points before attempting to open another one.

judyburgett3 commented 10 months ago

intall,ts 24

judyburgett3 commented 10 months ago

thank you

adrianjost commented 3 months ago

Is there any timeline when this might be fixed? Or is there anything I could do to support a fix?

It's a really annoying bug I run into multiple times a week. It also seems strange that an issue marked as priority 1 is has no activity for almost a year now.

@tidy-dev you seem to be the most active contributer, could you please take a look at this?

choxnox commented 2 months ago

Any updates here? We're facing the same issue and it's quite annoying that this functionality is often broken.