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

add hook item SortTroopSettingAppListView #702

Merged
merged 5 commits into from
Dec 2, 2023
Merged

Conversation

suzhelan
Copy link
Contributor

@suzhelan suzhelan commented Dec 2, 2023

Description

add my ScreenParamUtils
add hook item SortTroopSettingAppListView
Add a category FunctionEntryRouter.Locations.Auxiliary.GROUP_CATEGORY("auxiliary-group")
Please let me know if there is a maintenance conflict

Check List

  • I have tested the changes and verified that they work and don't break anything(as well as I can manage) or drop the support for previous versions.
  • I have merged commits that are meaningless for follow-up work and confirmed that they will not cause damage to follow-up maintenance

@cinit cinit merged commit e3ca40b into cinit:main Dec 2, 2023
4 checks passed
@cinit
Copy link
Owner

cinit commented Dec 2, 2023

你可以下次 commit 前先 git pull --ff-only (如果不行,显示有冲突的话,本地新建一个分支,把你本地分支 reset 到 origin/main) 然后再 commit, 这样你的 commit 的 parent 就是 origin/main 我就可以 fast-forward merge 了,就不会出现一堆 Merge remote-tracking branch 'origin/main' into suzhelan 的 merge commit,fast-forward merge 的一个好处是 commit id 不会变,也不需要 merge/squash/rebase.

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.

2 participants