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

Workshop #758

Merged
merged 5 commits into from
Jan 25, 2024
Merged

Workshop #758

merged 5 commits into from
Jan 25, 2024

Conversation

zpopov
Copy link
Contributor

@zpopov zpopov commented Jan 25, 2024

Changes made to the weblinks.
Thanks

@zpopov
Copy link
Contributor Author

zpopov commented Jan 25, 2024

I am probably pain right now but I am learning :-)

@robertoostenveld
Copy link
Member

bummer. I was just too late with my last comment on #757. I'll fix the conflict.

@robertoostenveld
Copy link
Member

I have merged the conflicting versions, please do a git pull before you make any other change

@zpopov
Copy link
Contributor Author

zpopov commented Jan 25, 2024

Do I need to Close the pull request now, which then signals to you guys the merge request? Or is it good now?

@robertoostenveld
Copy link
Member

no you should not close it! It will close automatically when I merge.

If you were to close prior to merge, I would assume that the proposed change does not apply any more and that it is to be discarded.

If you want to use the github pull request to flag to me (remotely) when to merge (as you working on it takes some time), then you should first submit the pull request in draft mode. In that mode, the PR cannot be merged by me yet. If you then switch from draft to open, that would flag to me that it is ready for review, I review, I merge and then it automatically closes.

@robertoostenveld robertoostenveld merged commit 200bb8f into fieldtrip:master Jan 25, 2024
@robertoostenveld
Copy link
Member

Let me merge this one, as I think it is ready.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants