Skip to content

Rename conflicting picture name

Vladimir Shushlin requested to merge vshushlin/git-case-sensetive-fix into master

Why is this change being made?

Having 2 files differ only by case Winnie vs winnie completely breaks git on case-insensetive file system, e.g. mac:

➜  www-gitlab-com git:(master) ✗ git status
On branch master
Your branch is up to date with 'origin/master'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	modified:   sites/uncategorized/source/images/team/pets/Winnie.jpg

no changes added to commit (use "git add" and/or "git commit -a")
➜  www-gitlab-com git:(master) ✗ git reset --hard
HEAD is now at 8acbf029a83d Merge branch 'add-achievements-blog' into 'master'
➜  www-gitlab-com git:(master) ✗ git status
On branch master
Your branch is up to date with 'origin/master'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	modified:   sites/uncategorized/source/images/team/pets/winnie.jpg

no changes added to commit (use "git add" and/or "git commit -a")

I just renamed the file.

Author Checklist

  • Provided a concise title for this Merge Request (MR)
  • Added a description to this MR explaining the reasons for the proposed change, per say why, not just what
    • Copy/paste the Slack conversation to document it for later, or upload screenshots. Verify that no confidential data is added, and the content is SAFE
  • Assign reviewers for this MR to the correct Directly Responsible Individual/s (DRI)
    • If the DRI for the page/s being updated isn’t immediately clear, then assign it to one of the people listed in the Maintained by section on the page being edited
    • If your manager does not have merge rights, please ask someone to merge it AFTER it has been approved by your manager in #mr-buddies
    • The when to get approval handbook section explains the workflow in more detail
  • If the changes affect team members, or warrant an announcement in another way, please consider posting an update in #whats-happening-at-gitlab linking to this MR
    • If this is a change that directly impacts the majority of global team members, it should be a candidate for #company-fyi. Please work with internal communications and check the handbook for examples.
Edited by Vladimir Shushlin

Merge request reports