@codingcoyote hopefully it's not too weird to dig up an old post (I always scan profiles before deciding to follow people) but OMG this is SO relatable - probably the most common piece of #Git advice I give people is not to mix merging and rebasing
Though I probably have not see a situation quite as messy as what you're describing 😅
„Diffing Word and Writer documents with Git“
https://spiffyk.cz/blog/git-pandoc/
By adding #pandoc as a #git diff driver and using it via git attributes. Plus #Forgejo config.
Git: Ignorare i file con .gitignore
Escludere file dal controllo versione
https://giovannilubrano.blogspot.com/2025/09/git-ignorare-i-file-con-gitignore.html
So, I have few news for yous. Hi! ✌️
I will start from small ones.
First one: I moved "Godot portfolio project" from https://gitlab.com/xolatgames/godot-portfolio-project to https://codeberg.org/xolatgames/godot-portfolio-project , and a little bit changed it.
And moved "Vasya and the jam" from https://github.com/xolatgames/vasya-prepare-jam-for-winter to https://codeberg.org/xolatgames/vasya-prepare-jam-for-winter
#codeberg #git #opensource #github #gitlab #indiegame #indiedev #indie #games #game
Git commit messages: do you use plain text or rather consciously markdown?
1. Reasons for plain text: Commit messages are not always viewed with tools which render markdown, and those which render markdown ... render which markdown exactly?
2. Reasons for markdown: most markdown constructs are meanwhile known to developers, so it improves readability even without rendering.
#git #gitlab #githib #codeberg #forgejo #markdown #commitmessage
All operations have gone back to normal! GitHub Actions is now used again! GitLab is now a mirror for our code!
#GitHub #Git #GitLab #TechNews #TechUpdates
https://officialaptivi.wordpress.com/2025/09/13/aptivi-project-operations-are-back-to-normal/
Article by @alefunguju on how to use pandoc to produce nice-looking diffs for docx and odt with #git, and even how to provide that functionality with #Forgejo.
https://spiffyk.cz/blog/git-pandoc/
Procesos en GitOps !
#programming #coding #programación #code #webdevelopment #devs #softwaredevelopment #gitops #git #github

I finally understand #git submodules.
Про «массовую атаку на пользователей GitHub, в ходе которой был получен контроль над 327 учётными записями и осуществлена подстановка вредоносного обработчика Github Action в 817 репозиториев. Атака привела к утечке 3325 секретов, используемых в системах непрерывной интеграции и передаваемых через переменные окружения, включая токены доступа к #PyPI, #GitHub, #NPM, #DockerHub и различным облачным хранилищам.»
На момент 2025/09/06 наблюдалось:
вредоносные коммиты были отменены примерно в 100 репозиториях. В настоящее время при поиске в #GitHub определяется 671 коммит с вредоносным Github Action.Сейчас же, по прошествию недели, определяется 669 коммита.

Erinnert mich an ein #git #repository mit der Besonderheit, dass, auch wenn deine Zeitreisende erfolgreich gewesen wären, sich historisch und futuristisch nichts änderte, da in diesem Land der verkackte #branch #dummbatzschland angelegt ist und jetzt nach vorn drängt.
Git: Stato dei file
Visualizzare lo stato dei file all'interno di un repository tramite git status
https://giovannilubrano.blogspot.com/2025/09/git-stato-dei-file.html