Skip to content

Fresh clone results in non-staged changes #9

@alignan

Description

@alignan

Fresh clone results in conflicts, preventing clean fetch/pull updates from the repo without having to manually clean conflicts.

$ git clone --recursive https://github.com/AllWize/allwize.git
Cloning into 'allwize'...
remote: Enumerating objects: 1269, done.
remote: Counting objects: 100% (1269/1269), done.
remote: Compressing objects: 100% (622/622), done.
remote: Total 2468 (delta 643), reused 1089 (delta 499), pack-reused 1199
Receiving objects: 100% (2468/2468), 5.28 MiB | 617.00 KiB/s, done.
Resolving deltas: 100% (1363/1363), done.
warning: the following paths have collided (e.g. case-sensitive paths
on a case-insensitive filesystem) and only one from the same
colliding group is in the working tree:

  'docs/AllWize_8cpp_source.html'
  'docs/Allwize_8cpp_source.html'
  'docs/AllWize_8h_source.html'
  'docs/Allwize_8h_source.html'
  'docs/classAllWize.html'
  'docs/classAllwize.html'

yields in:

Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   docs/AllWize_8cpp_source.html
	modified:   docs/AllWize_8h_source.html
	modified:   docs/classAllWize.html

Metadata

Metadata

Assignees

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions