Follow

if you learned that git merge can silently overwrite a file that you modified at the same time it was run, would you consider that a bug?

@joeyh yes? unless I told it to run a silent or forced merge, it should ask with a diff. but I would also expect this for uncommitted local changes since it has no obligation to know what hasn't been committed.

@joeyh If "at the same time" means "the same instant", no. Data race is a data race. I'll rethink what I'm doing with my life and why I modify the workdir that often.

If it means "while user was busy editing the commit message" or something, then yeah, a bug.

Sign in to participate in the conversation
Octodon

Octodon is a nice general purpose instance. more