-
Notifications
You must be signed in to change notification settings - Fork 191
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
Updating the code the "normal" way #598
Comments
Ah sorry this must be related to #509 where I rewrote git history using BFG Repo-Cleaner to remove some big JLD2 files that were accidentally pushed and blew up the size of the repository (500 MB+). But after rewriting git history everyone has to delete their local version of the repository and I think I cc'ed some people in the issue to warn them about this but didn't realize you still had an active copy, sorry about that! |
I had to do the same.
Chris
…On Wed, Jan 22, 2020 at 06:22 Ali Ramadhan ***@***.***> wrote:
Ah sorry this must be related to #509
<#509> where I
rewrote git history using BFG Repo-Cleaner
<https://rtyley.github.io/bfg-repo-cleaner/> to remove some big JLD2
files that were accidentally pushed and blew up the size of the repository
(500 MB+).
But after rewriting git history everyone has to delete their local version
of the repository and git clone a fresh copy.
I think I cc'ed some people in the issue to warn them about this but
didn't realize you still had an active copy, sorry about that!
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
<#598>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AA27DYHAEFWCPQLUQ7YGRH3Q7AT5RANCNFSM4KJ7WDRA>
.
|
Ah sorry about that. Don't think we'll have to do it again as all the damage happens in the |
@ali-ramadhan would it be good to send messages to everyone who has a fork maybe and maybe keep an issue open, so people who have cloned can see? Of course it would also be good not to rewrite the history - that pretty much breaks how git works. In theory reviewing PRs should catch this? |
That's a good idea, I think the only other person who had an issue was @arcavaliere who had an open PR at the time, but otherwise we could tag all the forkers.
Agreed. Yeah it took us a while to find the leak in #509 (JLD2 file wasn't added by us but by examples generating files when built) and the damage was contained to the Now that we're more aware of this issue I think we can stop it from happening again. |
Guessing this isn't an issue anymore so closing. |
Had an earlier clone, was on master branch, everything was in order as "git status"
nothing to commit, working tree clean
Then I updated my clone the usual way, just typing "git pull", but got plenty of warnings about
conflicts and so on. After that, "git status" reports:
On branch master
Your branch and 'origin/master' have diverged,
and have 1106 and 2212 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
so it looks like I am far from a clean update.
My question: how to proceed when trying to update my Oceananigans local clone and
why the standard way does not work for this repos ?
The text was updated successfully, but these errors were encountered: