title: What happens if I pull a change on a file earlier set assume-unchanged in Git?
body: <p>I'm curious if I run <code>git update-index --assume-unchanged</code>, and somebody chages that file in a way that produces a conflict, what happens, if I pull those changes? Do I get a simple conflict? Does it overwrite my changes, since it assumes the file is not changed?</p>