Skip to content

updateV1.9.0#838

Merged
jsign merged 2 commits intotextileio:masterfrom
back0893:updateV1.9.0
May 26, 2021
Merged

updateV1.9.0#838
jsign merged 2 commits intotextileio:masterfrom
back0893:updateV1.9.0

Conversation

@back0893
Copy link
Copy Markdown

Signed-off-by: liuguojun back0893@163.com
update lutos to v1.9.0

@jsign
Copy link
Copy Markdown
Contributor

jsign commented May 25, 2021

@back0893 , we're getting closer! Can you rebase to latest main to let the CI run?

@back0893
Copy link
Copy Markdown
Author

back0893 commented May 26, 2021

i run git rebase origin in my local branch,then commit
is all right?

@jsign
Copy link
Copy Markdown
Contributor

jsign commented May 26, 2021

git rebase master should be fine, and then force push the branch.

@back0893
Copy link
Copy Markdown
Author

force push?
i just commit and push

@jsign
Copy link
Copy Markdown
Contributor

jsign commented May 26, 2021

You'll need to git push --force for pushing after the rebase. Or just try git push and you should see an error mentioning that, give it a try

@back0893
Copy link
Copy Markdown
Author

back0893 commented May 26, 2021

but i just git push,and successful
i think i do some error...

@jsign
Copy link
Copy Markdown
Contributor

jsign commented May 26, 2021

Oh, remember to checkout master, git pull and then rebase. As to update your master branch before rebase to apply the newest changes.

Signed-off-by: liuguojun <back0893@163.com>
@back0893
Copy link
Copy Markdown
Author

i think i do.
i pull origin master ,rebase origin master,and git pull -f

golang-cli

Signed-off-by: liuguojun <back0893@163.com>
@jsign
Copy link
Copy Markdown
Contributor

jsign commented May 26, 2021

Thanks @back0893 !

@jsign jsign merged commit 9dd7e78 into textileio:master May 26, 2021
@back0893
Copy link
Copy Markdown
Author

back0893 commented May 26, 2021

Thanks @jsign ,Thank you for your patience

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