search

scidash / neuronunit

A package for data-driven validation of neuron and ion channel models using SciUnit
http://neuronunit.scidash.org
38 stars 24 forks source link

create branch optimization based on dev, that I can merge pull requests into. #254

Closed russelljjarvis closed 3 years ago

russelljjarvis commented 3 years ago

create branch optimization based on dev, that I can merge pull requests into.

rgerkin commented 3 years ago

@russelljjarvis Done.

russelljjarvis commented 3 years ago

AOK, I am about ready to PR into that branch. One problem. I have been doing Continuous Integration, and I have about 25 commits that are package management, related and I want to squash.

Doing git rebase -i HEAD~25, sort of seems to work, except that it burdens me with manual merges for every commit squash (up to 20 or so merges of the same files).

Do you know any good alternatives, where I squash but I only manual merge once if at all?

I think github PR now comes with merge squash on your end. Would that work for you?

I think I will assume yes, and try that way first.