search

fork-dev / Tracker

Bug and issue tracker for Fork for Mac
511 stars 12 forks source link

Stash and reapply no longer works #2234

Open TinBane opened 1 week ago

TinBane commented 1 week ago

Hi Guys,

Running 2.47.4.

Before the upgrade, if someone touched a file that I've also touched, instead of committing, pulling, then applying the commit, I could double click and choose "Stash and reapply" and it would put my changes on top for me to test, and throw a conflict if there were conflicting changes.

Since the latest update (not sure if I was on the version before, before the upgrade) when I try and do this I get the same result as pulling. 

Updating 5a1b01f..9b38a83

error: Your local changes to the following files would be overwritten by merge:
    file_we_are_both_changing.txt
Please commit your changes or stash them before you merge.
Aborting

If it helps debug the problem, this is a case where there is a conflict. If I choose to just stash in the same dialog, then apply it manually it works correctly. But having it all in one step was nice.

DanPristupov commented 1 week ago

Thank you for the bug report!

DanPristupov commented 1 week ago

It's not clear what dialog you are speaking about. Can you show a screenshot, please?

TinBane commented 6 days ago

Screen Shot 2024-11-11 at 08 34 13

I get this dialog when I double click on a future commit that I want to move to, which I cannot pull because I've edited the same files.

Screen Shot 2024-11-11 at 08 34 20

From the error dialog, it looks like it's trying to merge, not doing the stash and merge that it should do.

Previously, this would always work, or it would trigger a conflict.

DanPristupov commented 6 days ago

Thank you. We will release a hotfix soon.

TinBane commented 6 days ago

BTW, absolutely love your product. It's saved me and my team so much time and hassle.