Skip to content

Conversation

@ebrahimebrahim
Copy link
Collaborator

@ebrahimebrahim ebrahimebrahim commented Feb 28, 2025

I made a mistake while merging where I overwrote some previous DVC changes in PR #212

This corrects that error, so it brings the DVC database to a manual merge of the state it was in before #212 was merged, and the state it was supposed to be in on my topic branch before the flawed rebase of #212.

I made a mistake while merging where I overwrote some previous DVC
changes.

Issue #122
@ebrahimebrahim ebrahimebrahim force-pushed the 179-add-virtual-fit-transform-to-session-definition branch from 0c53b17 to ecde385 Compare February 28, 2025 16:16
@ebrahimebrahim
Copy link
Collaborator Author

Hey Andrew, sorry about the confusing PR here...

What happened is I merged #212 without carefully checking how the DVC data was going to get git-rebased. It ended up wiping out some changes that were already in main 😬
Namely the password hash changes that you had introduced.
So this PR is just fixing that and bringing the DVC data to contain both what it previously had in main and the new changes I was trying to introduce in #212.

@arhowe00
Copy link
Contributor

arhowe00 commented Feb 28, 2025

Sounds good -- I don't know how to review hashes so I'll just make sure the passwords work when pulling the db version in this commit?

@ebrahimebrahim
Copy link
Collaborator Author

That works. You can verify that the password hash changes and new readme that you added are there, while also the virtual fits are updated to the new structuring

Copy link
Contributor

@arhowe00 arhowe00 left a comment

Choose a reason for hiding this comment

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

Confirmed the presence of User hashes, readme, and virtual fitting results being saved in sessions.

@ebrahimebrahim ebrahimebrahim merged commit 0db543a into main Feb 28, 2025
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants