# Git pull - merge conflicts with Manifest.toml although it's in .gitignore

**URL:** <https://discourse.julialang.org/t/git-pull-merge-conflicts-with-manifest-toml-although-its-in-gitignore/65069>\
**Category:** General Usage\
**Created:** [July 21, 2021, 8:52pm UTC](https://discourse.julialang.org/t/git-pull-merge-conflicts-with-manifest-toml-although-its-in-gitignore/65069 "2021-07-21T20:52:34Z")\
**Posts on this page:** 1\
**Page:** 1

<div class="post-metadata">

**Author:** ![meck](https://avatars.discourse-cdn.com/v4/letter/m/e36b37/32.png) [@meck](https://discourse.julialang.org/u/meck)\
**Post date:** [July 21, 2021, 8:52pm UTC](https://discourse.julialang.org/t/git-pull-merge-conflicts-with-manifest-toml-although-its-in-gitignore/65069/1 "2021-07-21T20:52:34Z")

</div>

```julia
➜ 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`