search

msmbuilder / msmbuilder-legacy

Legacy release of MSMBuilder
http://msmbuilder.org
GNU General Public License v2.0
25 stars 28 forks source link

my fork has diverged from the parent #391

Closed schwancr closed 10 years ago

schwancr commented 10 years ago

My fork of msmbuilder seems to have diverged from master. If I submit a pull request, I get to this page: https://github.com/schwancr/msmbuilder/compare/SimTk:master...master

Does anyone understand why this happened? My fork is also no longer on the simtk/msmbuilder network. I'm confused.

kyleabeauchamp commented 10 years ago

No idea, pretty weird.

rmcgibbo commented 10 years ago

This is my fault. I tried to remove some of the big trajectory files from the git history, because cloning requires downloading like 150 MB of data even though the repository is less than 15. But I think I did it in such a way that a lot of commits were "rewritten", so maybe that creates a huge divergence between the master branch and your fork. I'm not 100% sure, but it's a plausible reason...

schwancr commented 10 years ago

K that makes sense. Is there any way to merge commits and just keep the remote changes? There was a way with svn to do this