Skip to content

Feature GWSS #15

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

Closed
wants to merge 14 commits into from
Closed

Feature GWSS #15

wants to merge 14 commits into from

Conversation

HPDell
Copy link
Member

@HPDell HPDell commented Jan 17, 2024

DO NOT MERGE

Changelog:

  • Basic Intefaces

@HPDell HPDell marked this pull request as draft April 12, 2024 09:34
@RoryuOu RoryuOu marked this pull request as ready for review March 2, 2025 03:41
@RoryuOu RoryuOu requested review from YiyunZhuang and RoryuOu March 2, 2025 03:43
@RoryuOu
Copy link
Contributor

RoryuOu commented Mar 2, 2025

  • devtools::document()生成rd还是报错,我试了一下master的也有问题,不知道是不是roxygen2版本问题?
  • 这里的conflicts要怎么解决,要先拉一个分支把master的子模块更新吗?

@HPDell
Copy link
Member Author

HPDell commented Mar 3, 2025

我看到的的错误是这个

make: *** No rule to make target `libgwmodel/src/gwmodelpp/GWAverage.cpp', needed by `libgwmodel/src/gwmodelpp/GWAverage.o'.  Stop.
   ERROR: compilation failed for package ‘GWmodel3’

@HPDell
Copy link
Member Author

HPDell commented Mar 3, 2025

这个 Conflicts 要把分支 rebase 到 master 上,手动解决冲突后再推送

@HPDell
Copy link
Member Author

HPDell commented Mar 3, 2025

我看到的的错误是这个

make: *** No rule to make target `libgwmodel/src/gwmodelpp/GWAverage.cpp', needed by `libgwmodel/src/gwmodelpp/GWAverage.o'.  Stop.
   ERROR: compilation failed for package ‘GWmodel3’

哦这个是我的问题,更新了子模块就好了

@RoryuOu RoryuOu changed the title GWSS Feature GWSS Mar 7, 2025
@RoryuOu
Copy link
Contributor

RoryuOu commented Mar 7, 2025

这个 Conflicts 要把分支 rebase 到 master 上,手动解决冲突后再推送

所以是我这个分支最初更改的时候,master还不在那个版本里,所以要rebase把所有更改放到master之后?我现在用的是v0.11,要不统一切换到v0.12去?

@RoryuOu
Copy link
Contributor

RoryuOu commented May 30, 2025

使用新的分支对GWCorrelationGWAverage分别进行开发与合并

@RoryuOu RoryuOu closed this May 30, 2025
@RoryuOu RoryuOu deleted the feat/gwss branch June 7, 2025 03:37
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