Restores the previous state when reopened #27

2025-02-23T03:16:40-08:00

MantashaNoyela commented

2025-02-23 03:16:40 -08:00

(Migrated from github.com)

It ensures that when the application is reopened after being fully closed, it retains the previous state, including the number of players, buy-in amount, and chip distribution, allowing for a seamless continuation of poker game planning.

djwesty (Migrated from github.com) reviewed 2025-02-23 03:16:40 -08:00

Vutukuri15 (Migrated from github.com) reviewed 2025-02-23 03:16:40 -08:00

djwesty commented

2025-02-23 10:24:19 -08:00

(Migrated from github.com)

@MantashaNoyela Can you resolve merge conflicts prior to our review? Thanks!
Same for #26

@MantashaNoyela Can you resolve merge conflicts prior to our review? Thanks! Same for #26

djwesty commented

2025-02-23 19:27:20 -08:00

(Migrated from github.com)

I'll give this a more thorough review when you resolve the conflicts (notify me again then), but at a quick glance It seems like this PR is meant to address issue #9, but also may have commits included which address issue #10 and issue #18. I think those are intended to be for other PRs so this should be fixed up.

The issue can be avoided in the first place by always branching off of the latest main branch. At this point though it's a little more messy. There's a few approaches like creating a new branch off of main and cherry-picking (may require a new PR, not sure). Or reseting the branch to the commit before the unwanted changes, and then applying the commits you do want manually. There may also be other ways, but in any case you should be careful to test and not erase any work especially if you end up force pushing on the same branch with a different commit history.

I'll give this a more thorough review when you resolve the conflicts (notify me again then), but at a quick glance It seems like this PR is meant to address issue #9, but also may have commits included which address issue #10 and issue #18. I think those are intended to be for other PRs so this should be fixed up. The issue can be avoided in the first place by always branching off of the latest `main` branch. At this point though it's a little more messy. There's a few approaches like creating a new branch off of main and cherry-picking (may require a new PR, not sure). Or reseting the branch to the commit before the unwanted changes, and then applying the commits you do want manually. There may also be other ways, but in any case you should be careful to test and not erase any work especially if you end up force pushing on the same branch with a different commit history.

Vutukuri15 commented

2025-02-24 10:52:40 -08:00

(Migrated from github.com)

Try to resolve the conflicts, Mantasha. I will also review once you resolve them.

MantashaNoyela commented

2025-02-25 20:08:43 -08:00

(Migrated from github.com)

I had to close this because of having index file merge conflict.