Skip to content

Extra pumpingtest#67

Closed
HsHeesen wants to merge 7 commits intotimflow-org:devfrom
HsHeesen:update-pumpingtest
Closed

Extra pumpingtest#67
HsHeesen wants to merge 7 commits intotimflow-org:devfrom
HsHeesen:update-pumpingtest

Conversation

@HsHeesen
Copy link

No description provided.

@mbakker7
Copy link
Contributor

I am not sure what happened. Didn't we merge this PR last week? And now you added to it?

@mbakker7
Copy link
Contributor

PR #65 was merged 3 days ago. Did you maybe not update your branch with the latest dev?

@dbrakenhoff
Copy link
Contributor

If you accidentally continued on your old branch, instead of updating dev and creating a new branch from there, the command git cherry-pick will help you bring your last commit to a new branch:

For example:

  1. Checkout the dev branch, and make sure it is up to date, with git pull
  2. Create a new branch git checkout -b <new_branch>
  3. Cherry-pick your last commit and apply it in the new branch: git cherry-pick 43165f2053aa35bd21f3171e812794f7bd31ed3b. The long code is the SHA of the last commit in this PR.
  4. Stage and commit changes and publish branch.

@mbakker7
Copy link
Contributor

One other much more ugly (but maybe easier) option. In case all you did is change some notebooks: Copy all the notebooks you changed to a different directory. Delete your branch. Checkout/update the dev branch. Then make a new branch and copy your saved notebooks there. Then make a new PR.

@dbrakenhoff
Copy link
Contributor

One other much more ugly (but maybe easier) option. In case all you did is change some notebooks: Copy all the notebooks you changed to a different directory. Delete your branch. Checkout/update the dev branch. Then make a new branch and copy your saved notebooks there. Then make a new PR.

Haha, that is much easier... Not sure what I was thinking 😅

@HsHeesen
Copy link
Author

Ooh sorry, I did not notice that I continued on the old branch. I will copy the files and create a new PR.

@mbakker7
Copy link
Contributor

Superseded by #73

@mbakker7 mbakker7 closed this Mar 18, 2026
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