# Conflicts:
#	locale/gitlab.pot
#	spec/features/discussion_comments/commit_spec.rb

Disable juint reports tmp

See merge request gitlab-org/gitlab-ce!30254

Resolve "Cannot delete and upload file of the same name in the Web IDE"

Closes #60859

See merge request gitlab-org/gitlab-ce!30239

If an entry has been removed from the tree and later, during the same
session, a user is trying to add a new item with the same name/path we
should allow for that as long as the original entry is marked with
`deleted`.