I have a branch called add-ivp-solver
that I have submitted as a PR for a project on GitHub. The branch has gotten a bit bloated and we now wish to move some of the files out of add-ivp-solver
to a new branch called add-models
which will be submitted as another PR in the future.
I would like to know if it is possible to move files and their associated commit history from add-ivp-solver
to add-models
in a way that will allow us to cleaning merge add-ivp-solver
into master
and close the original PR.
I think that git filter-branch
might be what I need. This should allow me to remove the files and commit history from add-ivp-solver
to add-models
, but I am concerned that it will leave add-ivp-solver
in an "inconsistent state" which will make it nearly impossible to merge and close the PR.