search

microsoft / winget-pkgs

The Microsoft community Windows Package Manager manifest repository
MIT License
8.53k stars 4.43k forks source link

Problem with w\WikiPad manifest? #22505

Closed jsmorley closed 3 years ago

jsmorley commented 3 years ago

Create issues related to the winget.exe client here

Brief description of your issue

When I fork and clone the repository to my local PC, the entry for w\WikiPad in Manifests is always marked as "dirty" on my PC. My fork insists that it is up to date with Master, and I can't see how to resolve this. Is there some error in the repository for the Manifest w\WikiPad ?

Steps to reproduce

Forked the repo to my account on GitHub and using TortoiseGit created a clone on my local PC

Expected behavior

I would expect a full, clean copy of the repo on my PC

Actual behavior

The Manifest w\WikiPad is always flagged as "dirty"

Environment

Windows Package Manager v1.0.11694
Copyright (c) Microsoft Corporation. All rights reserved.

Windows: Windows.Desktop v10.0.22000.100
Package: Microsoft.DesktopAppInstaller v1.15.11694.0

Any other software?
TortoiseGit 2.12.0.0 (C:\Program Files\TortoiseGit\bin)
git version 2.31.1.windows.1 (C:\Program Files\Git\bin; C:\Program Files\Git\mingw64\; C:\Program Files\Git\etc\gitconfig)
ImJoakim commented 3 years ago

Hey @jsmorley, what's your issue exactly? Please fill out the fields above to the best of your ability and we'll be happy to help :)

jsmorley commented 3 years ago

Sorry, looks like I didn't create the issue correctly.

What happens is that I fork the repository to my account on GitHub, and clone it to my local PC.

The Manifest \w\WikiPad is always flagged as dirty.

My fork insists it is up to date.

I suspect that maybe there is some problem with \w\WikiPad in the Master?

ItzLevvie commented 3 years ago

There's a capitalization issue over at https://github.com/microsoft/winget-pkgs/tree/master/manifests/w/WikidPad which is why you're seeing this.

Both WikidPad and Wikidpad folders exist and they need to be merged into one so it doesn't conflict with each other.

jsmorley commented 3 years ago

Thank you. I will just wait for it to be fixed.

I would assume this is going to cause TortoiseGit to bark if and when I try to do a push with changes I make to my Manifest at \r\Rainmeter, since presumably it will see an "unresolved conflict".