Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Properly parse carddav address-data - fixes #1017 #1028

Merged
merged 1 commit into from Jan 22, 2018

Conversation

DeepDiver1975
Copy link
Member

No description provided.

@staabm
Copy link
Member

staabm commented Jan 22, 2018

just curious: did you intenionally not cherry pick/merge this commits?

@DeepDiver1975
Copy link
Member Author

just curious: did you intenionally not cherry pick/merge this commits?

I did cherry-pick this last week together with the other PR #1027 - but I simply did forget to open the PR ;-)

@staabm
Copy link
Member

staabm commented Jan 22, 2018

hmm ok, wondered why the git hashes are different then. I had the impression those should be equal after cherry picking, but I might be wrong.

@DeepDiver1975
Copy link
Member Author

hmm ok, wondered why the git hashes are different then. I had the impression those should be equal after cherry picking, but I might be wrong.

no - the hashes change on cherry-pick.

But as we speak - I just reminded myself that usually merge across all branches was used in the past. I'm not that familiar with this type of repo handling.

Should we keep the old mechanism? I don't want to dictate the way I'm used to work on here.

@staabm staabm merged commit 9f6edb3 into 3.3 Jan 22, 2018
@staabm staabm deleted the 3.3-be053a75ed08e375961373f5f705c2fa8023f913 branch January 22, 2018 10:10
@staabm
Copy link
Member

staabm commented Jan 22, 2018

I also have no preference and dont know whether there are benefits of doing it like one way or the other.

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.

None yet

2 participants