feat(server, web): smart merge #5796
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Deploying with
|
| Latest commit: |
bea83ae
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://b50def8c.immich.pages.dev |
| Branch Preview URL: | https://feat-smart-merge.immich.pages.dev |
|
From a user perspective, that smart merge toggle isn't clear of what it would do. To improve it, we could make this into a default mechanism. In the case users are confused about what information about the merger is kept, we can create an info card to show the end result i.e name, birthday, ...etc |
martabal
force-pushed
the
feat/smart-merge
branch
from
b7cfcce
to
84336d5
Compare
martabal
force-pushed
the
feat/smart-merge
branch
from
84336d5
to
113709f
Compare
3 tasks
jrasm91
reviewed
Jan 1, 2024
jrasm91
reviewed
Jan 1, 2024
jrasm91
reviewed
Jan 1, 2024
martabal
force-pushed
the
feat/smart-merge
branch
from
95802b3
to
090f2a5
Compare
jrasm91
reviewed
Jan 9, 2024
|
I agree we should just do this by default and no need to make it something the user can turn on and off. |
martabal
force-pushed
the
feat/smart-merge
branch
from
06e08ec
to
1a2b44c
Compare
jrasm91
approved these changes
Jan 18, 2024
|
I fixed it so that the merged person's data is selectively copied over. The way it was written before could allow data to be overridden in some scenarios, which seemed undesirable. |
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes made in this PR
Currently, when you merge person A with person B, you lose the information you set about person A. With this PR, when you merge person A with person B, the server updates the person's information. person B with person A's information if person B's information is undefined. This only works when you only merge one person with another
person.
fixes #5848