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

chore: 🗑️ replace deprecated ioutil #1028

Merged
merged 4 commits into from
Aug 11, 2024
Merged

Conversation

eryajf
Copy link
Contributor

@eryajf eryajf commented Aug 11, 2024

这里顺便请教下,这里我不太会玩了。

我上次的流程是,fork仓库,然后更改,之后commit更改,然后提交pr,被合并之后,我在我的fork那里点击了sync,接着再次更改,再次commit,再次过来fork,不知道为什么这里仍然显示上次的更改commit。

上次已经遇到这个情况,我的做法是删掉fork仓库,重新fork,但这太麻烦,请教下有没有更好的方式。

@kongfei605
Copy link
Collaborator

kongfei605 commented Aug 11, 2024

fork 仓库,将上游仓库设置为upstream, 本地 checkout -b 一个开发分支; commit && push ,等merge 后 ,checkout到本地main分支 git pull --rebase upstream main (同步上游仓库main分支)

开发完的分支 直接本地和远端都删除掉就好。新feature 新分支就好。

@kongfei605 kongfei605 merged commit 9530c85 into flashcatcloud:main Aug 11, 2024
2 of 3 checks passed
@kongfei605
Copy link
Collaborator

Thank you @eryajf

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