Where communities thrive


  • Join over 1.5M+ people
  • Join over 100K+ communities
  • Free without limits
  • Create your own community
People
Repo info
Activity
    David Macek
    @elieux
    Hi. I think the official way would be to use the SDK.
    Brent Arias
    @brentarias
    I have a merge conflict between a feature branch, and my master branch. Normally I would resolve this by merging master into my feature branch, resolving the conflict(s), and then merging back.
    However, I want to pollute my feature branch with all the other things on master. How can I perform a merge to my feature branch only of the file conflicts?
    David Macek
    @elieux
    You can merge an older commit on master if that helps.
    clunion
    @clunion
    Hi, landed here while searching for info on a not-trusted key of the git-for-windows installation in Msys2.
    Just got it working in Msys2 (and VSCode and TortoiseGit) by following Install-inside-MSYS2-proper.
    There was just one little stumbling block: one of the keys (@dscho) was not initially trusted. That could be solved by signing the key locally via ┬┤pacman-key --lsign-key <key-id>┬┤.
    Don't know if that was a problem only on my installation or on the trust-setting at the repository. Perhaps this info may help others with the same problem, took me some time.
    David Macek
    @elieux
    Did you follow step 2 of the guide, @clunion?
    clunion
    @clunion
    Yes. That step did not work initially (did hang, had to break it after about 20 minutes), i then tried to do the 3 commands step by step, which did not work ether. After some probing i re-initialised the pacman trust-db and did some other steps, until the Step 2 finally worked as shown in the guide. But the key was still not trusted.
    David Macek
    @elieux
    Ah, okay, there seems to be a new key.
    David Macek
    @elieux
    Thanks for the notice.
    Page is now updated.
    clunion
    @clunion
    Great, thanks for the quick response!
    Yajat Mehta
    @yajat2402:matrix.org
    [m]
    can anyone help me out with this problem
    how to solve it as my program is not executing
    David Macek
    @elieux
    It's not even compiling actually.
    It looks like you're missing an entry point. Most often main().
    Yajat Mehta
    @yajat2402:matrix.org
    [m]
    see its not even executing the simplest one
    i think there is some issue with mingw but don't know how to fix :(
    David Macek
    @elieux
    I don't see anything wrong with the program.
    But you have GCC 6, maybe even a mingw.org toolchain. This is pretty old, so my advice is to use a recent mingw-w64 based toolchain instead.
    Andreas Schroeck
    @schroeca
    I have some issues with my msys2 installation. I can not update the git-for-windows repository. I have tried a lot of different things with the keyring, because it looks like an issue with the key
    Is this a known issue? I could not find any help on google
    image.png
    Johannes Schindelin
    @dscho
    pacman-key --lsign-key E8325679DFFF09668AD8D7B67115A57376871B1C
    Stephen Lyons
    @SlySven
    Anyone know who owns the gpg key: 91883E11E83DC29D14104DB4EDD44359093056EE - I am having the same sort of problem as @schroeca but for this key instead:
    stephen@Rachel MSYS ~
    $ pacman -Syuu
    error: git-for-windows-mingw64: key "91883E11E83DC29D14104DB4EDD44359093056EE" is unknown
    :: Import PGP key 91883E11E83DC29D14104DB4EDD44359093056EE? [Y/n] y
    error: key "91883E11E83DC29D14104DB4EDD44359093056EE" could not be looked up remotely
    error: git-for-windows-mingw32: key "91883E11E83DC29D14104DB4EDD44359093056EE" is unknown
    :: Import PGP key 91883E11E83DC29D14104DB4EDD44359093056EE? [Y/n] y
    error: key "91883E11E83DC29D14104DB4EDD44359093056EE" could not be looked up remotely
    :: Synchronizing package databases...
     git-for-windows-mingw64                                   15.7 KiB  10.7 KiB/s 00:01 [################################################] 100%
     git-for-windows-mingw32                                   15.7 KiB  31.4 KiB/s 00:01 [################################################] 100%
     mingw32 is up to date
     mingw64 is up to date
     ucrt64 is up to date
     clang64 is up to date
     msys is up to date
    error: git-for-windows-mingw64: key "91883E11E83DC29D14104DB4EDD44359093056EE" is unknown
    :: Import PGP key 91883E11E83DC29D14104DB4EDD44359093056EE? [Y/n] n
    error: git-for-windows-mingw32: key "91883E11E83DC29D14104DB4EDD44359093056EE" is unknown
    :: Import PGP key 91883E11E83DC29D14104DB4EDD44359093056EE? [Y/n] n
    error: failed to synchronize all databases (invalid or corrupted database (PGP signature))
    
    stephen@Rachel MSYS ~
    Johannes Schindelin
    @dscho
    It's my GPG key. It's the same as @schroeca reported.
    Stephen Lyons
    @SlySven
    But that is a different one, isn't it:
    91883E11E83DC29D14104DB4EDD44359093056EE
    verses:
    E8325679DFFF09668AD8D7B67115A57376871B1C
    Johannes Schindelin
    @dscho
    The former is a subkey of the latter.
    Have you tried following the steps in the linked wiki page?
    Stephen Lyons
    @SlySven
    Ah, one is your signing key and the other your authentication one?
    Johannes Schindelin
    @dscho
    s/authentication/primary/
    Stephen Lyons
    @SlySven
    :stuck_out_tongue_closed_eyes:
    David Macek
    @elieux
    $ gpg --homedir /etc/pacman.d/gnupg/ --with-subkey-fingerprints --list-keys 0x91883E11E83DC29D14104DB4EDD44359093056EE
    gpg: Note: trustdb not writable
    pub   rsa4096 2021-03-23 [SC] [expires: 2026-03-22]
          E8325679DFFF09668AD8D7B67115A57376871B1C
    uid           [ultimate] Johannes Schindelin <johannes.schindelin@gmx.de>
    sub   rsa4096 2021-03-23 [E] [expires: 2026-03-22]
          958D57D8AD8823F11D033AAB6D0EA17128B145BC
    sub   rsa4096 2021-03-23 [S] [expires: 2026-03-22]
          91883E11E83DC29D14104DB4EDD44359093056EE
    Stephen Lyons
    @SlySven
    AH, RTFM - the wiki step 2 was enough to get things going again...!
    David Macek
    @elieux
    Took me a while to find the right syntax. :D
    Stephen Lyons
    @SlySven
    curl -L https://raw.githubusercontent.com/git-for-windows/build-extra/HEAD/git-for-windows-keyring/git-for-windows.gpg |
    pacman-key --add - &&
    pacman-key --lsign-key E8325679DFFF09668AD8D7B67115A57376871B1C &&
    pacman-key --lsign-key 3B6D86A1BA7701CD0F23AED888138B9E1A9F3986
    :thinking: Would it be worthwhile publishing that public key to https://keys.openpgp.org ?
    David Macek
    @elieux
    I did look for it there, but somehow missed it.
    Johannes Schindelin
    @dscho
    No, you didn't.
    David Macek
    @elieux
    I guess I expected a printout instead of just a link.
    Johannes Schindelin
    @dscho
    5 minutes ago it wasn't there :-)
    Was that your Yubikey?
    ;-)
    David Macek
    @elieux
    :D Okay, you got me.
    Stephen Lyons
    @SlySven

    5 minutes ago it wasn't there :-)

    Yes, it wasn't...

    *sigh*

    Stephen Lyons
    @SlySven
    Ah, it has been a while and the update to my setup needs a 3GB download - and I'm currently on a public WiFI - really need to wait 'til I get home and back on a fat pipe to the Interweb...