Skip to content

Conversation

@onenewcode
Copy link
Contributor

No description provided.

@YdrMaster YdrMaster force-pushed the dev branch 2 times, most recently from 5d5f3a2 to c391886 Compare January 24, 2025 09:37
@YdrMaster YdrMaster self-assigned this Jan 24, 2025
@YdrMaster YdrMaster deleted the branch InfiniTensor:dev January 25, 2025 05:43
@YdrMaster YdrMaster closed this Jan 25, 2025
@YdrMaster YdrMaster reopened this Jan 25, 2025
@onenewcode onenewcode closed this Feb 3, 2025
@onenewcode onenewcode reopened this Feb 3, 2025
@onenewcode onenewcode force-pushed the dev branch 5 times, most recently from 1842203 to 04fd489 Compare February 5, 2025 07:09
@YdrMaster
Copy link
Contributor

通过 rebase 来引入上游比较好,可以避免同步改导致的冲突。两边实际上改的是不同的文件,本来是没冲突的

@onenewcode onenewcode reopened this Feb 10, 2025
@YdrMaster YdrMaster merged commit d67f60f into InfiniTensor:dev Feb 11, 2025
2 checks passed
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