➜ Oceananigans.jl git:(master) git pull
Auto-merging Project.toml
Auto-merging Manifest.toml
CONFLICT (content): Merge conflict in Manifest.toml
error: could not apply 501c1db7... updates in manifest and project tomls
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 501c1db7... updates in manifest and project tomls
➜ Oceananigans.jl git:(a38684d1) ✗
I already untracked it with:
git rm --cached Manifest.toml