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

Use username as conflict file name and add username field to commit #2786

Merged
merged 2 commits into from
Jun 28, 2024

Conversation

feiniks
Copy link
Contributor

@feiniks feiniks commented Jun 20, 2024

No description provided.

@@ -21,6 +21,7 @@ struct _SeafCommit {
char root_id[41]; /* the fs root */
char *desc;
char *creator_name;
char *username;
Copy link
Member

Choose a reason for hiding this comment

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

这里注释一下和 creator_name 的区别,一个是 email 一个是 user friendly username。

@killing killing merged commit 1e4556e into master Jun 28, 2024
@killing killing deleted the add_username branch June 28, 2024 07:00
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