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

Discussion notebook #42

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Discussion notebook #42

wants to merge 3 commits into from

Conversation

turbomam
Copy link
Member

@turbomam turbomam commented Nov 18, 2021

salvaged from Sujay's PDC conversion branch

as discussed 2021-11-18

@turbomam turbomam marked this pull request as draft November 18, 2021 20:26
@gaurav
Copy link
Collaborator

gaurav commented Nov 19, 2021

So there are three commits in this PR:

Therefore I propose that we delete both 990c973 and d30d205 from this PR, leaving only 809409d.

@turbomam Does that look right to you?

@turbomam
Copy link
Member Author

turbomam commented Dec 6, 2021

@turbomam Does that look right to you?

yes. I'm looking into how to do that now.

@turbomam
Copy link
Member Author

turbomam commented Dec 6, 2021

I'd like to take this git rebase -i HEAD~n approach

@gaurav
Copy link
Collaborator

gaurav commented Dec 6, 2021

Yup, that's what I would do! (I know it as git rebase -i HEAD^^^^ approach, which I think is equivalent to HEAD~4). I would make a backup of your original branch before messing with this, i.e.

$ git checkout -b backup1
$ git checkout discussion_notebook
$ git rebase -i HEAD^^^^

That way, if you mess things up, you can delete discussion_notebook and recreate it from backup1. Once you're happy with discussion_notebook, you will need to use git push origin discussion_notebook -f to force-replace the branch on GitHub with your branch. Have fun!

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.

3 participants