1 Persons are tagged with #git

#git

2 Likes
rainerhgw@diasp.org
Rainer Sokoll ✅

#git ist ja auch irgendwie ein #Dreckstool

❯ git revert --no-commit 9a13096..HEAD
error: The following untracked working tree files would be overwritten by merge:
    .ssh/gitlab.example.com
    .ssh/gitlab.example.com.pub
    .ssh/gitlab.example.org
    .ssh/gitlab.example.org.pub
Please move or remove them before you merge.
Aborting
fatal: revert failed
❯ rm gitlab.*
❯ git revert --no-commit 9a13096..HEAD
error: revert is already in progress
hint: try "git revert (--continue | --abort | --quit)"
fatal: revert failed
❯ git revert --continue
CONFLICT (modify/delete): .ssh/.gitignore deleted in HEAD and modified in parent of ec1bcec (do not version keys).  Version parent of ec1bcec (do not version keys) of .ssh/.gitignore left in tree.
error: could not revert ec1bcec... do not version keys
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
3 Likes
8 Comments
bkoehn@diaspora.koehn.com
Brad Koehn ☑️

I put my #Diaspora pod configuration into a public #git repository for others to nitpick learn from. It includes a handy justfile with recipes for managing a deployed pod.

https://git.koehn.com/k3s-home/diaspora

My base justfile is available here, with lots of recipes for finding current versions of software from places like GitHub, Debian, and Docker repos, and automating upgrades, builds, and deployments:

https://git.koehn.com/k3s-home/justfile-k3s/src/branch/main/justfile

diaspora

All the k8s deployment information for

4 Likes
danie10@squeet.me
Danie

Radicle is an open source, peer-to-peer code collaboration stack alternative to GitHub

A sci-fi type of illustration showing three alien characters standing on flat stones with a tree on each side of the frame, looking towards the background where a large moon is in the sky just above the horizon
It leverages Git’s architecture combined with cryptography and a gossip protocol to enable a fully sovereign developer network. All social artifacts are stored in Git, and signed using public-key cryptography. Radicle verifies the authenticity and authorship of all data for you.

The Radicle protocol leverages cryptographic identities for code and social artifacts, utilizes Git for efficient data transfer between peers, and employs a custom gossip protocol for exchanging repository metadata.

Radicle enables users to run their own nodes, ensuring censorship-resistant code collaboration and fostering a resilient network without reliance on third-parties.

Radicle installs on your own Linux, macOS or BSD computer and will connect remotely to other remote peers. But note this likely works using git CLI commands so don’t expect the pretty GitHub interface.

See https://radicle.xyz/guides/user
#Blog, #decentralised, #git, #opensource, #technology

6 Likes
1 Comments
utzer@social.yl.ms
utzer [Friendica]

Gibt es hier Leute die sich gut mit #forgejo, vormals #gitea, auskennen?

Es geht um das Handling von Forks und das synchronisieren dieser.

Siehe hier: https://social.yl.ms/display/e18176ef-9965-03f8-3321-47f655039332

Das technische Problem ist eine Sache, aber es geht auch darum, ob ich das richtig verstehe mit Pull und Push, ich hab nicht viel Ahnung von #Git, weswegen ich hier frage.

cc @Matthias ✔ #Friendica

Matthias ✔

!Friendica Developers Are there any problems with git.friendi.ca/ at the moment? I tried to update my addon directory, which runs into an error. Forking a ne...

2 Comments