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 SortTroopSettingAppListView #699

Closed
wants to merge 9 commits into from
Closed

add SortTroopSettingAppListView #699

wants to merge 9 commits into from

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")
Submodule [LSPIant] may have been updated unexpectedly (I have tried reverting the commit and the issue has been resolved?)
Please let me know if there is a maintenance conflict

Issues Fixed or Closed by This PR

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

@suzhelan suzhelan closed this Dec 2, 2023
@cinit
Copy link
Owner

cinit commented Dec 2, 2023

git commit 建议使用 Android Studio 或者 IDEA 的图形化 commit, 它支持选择你需要 commit 的文件或者代码片断。不要 git add .

@suzhelan
Copy link
Contributor Author

suzhelan commented Dec 2, 2023

git commit 建议使用 Android Studio 或者 IDEA 的图形化提交,它支持选择你需要提交的文件或者代码片断。不要使用 git add 。
我是使用Android studio在某次意外签出导致的子模块被更新并且找不到方法还原子模块
经过还原mian分支发现仍然无法恢复子模块问题 , 我已经还原分支进度并在本地展开新分支push到我的远程分支现在已再次尝试pr到Base/main

@suzhelan suzhelan deleted the main branch December 2, 2023 00:46
@cinit
Copy link
Owner

cinit commented Dec 2, 2023

你可以看一下 origin/main 现在的 commit id, 然后在本地新建一个分支,切换到新分支,随后把分支 reset 到 origin/main 的 commit id (注意如果有未 commit 的文件的话不要用 hard) 再执行 git submodule update, 然后把你的代码改动 chery-pick 到新分支上,然后推到 PR。

@suzhelan
Copy link
Contributor Author

suzhelan commented Dec 2, 2023

在刚刚我已经整理了远程分支并将我的新远程分支从fixMain(修好的分支)更改名称为main分支 , 原出现错误且回滚无效的分支已删除,现再次尝试重新pr,应该好了

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