!UNVBThoJtlIiVwiDjU:nixos.org

Staging

382 Members
Staging merges | Find currently open staging-next PRs: https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+sort%3Aupdated-desc+head%3Astaging-next+head%3Astaging-next-21.05+is%3Aopen125 Servers

Load older messages

SenderMessageTime
28 Oct 2021
@r-burns:matrix.orgRyan Burns
In reply to @moritz.hedtke:matrix.org
Fix git :D. Just add a custom merge algorithm that takes generated files into account :D
just! 		18:18:56
@moritz.hedtke:matrix.orgmoritz.hedtke
In reply to @r-burns:matrix.org
just!
I think the main problem would be that the ways files are generated in the repository is not clearly specified in a machine-readable form. Otherwise I assume this would be not too hard 		18:20:26
@sandro:supersandro.deSandrothe problem is rather which entry wins18:21:12

There are no newer messages yet.

Back to Room ListRoom Version: 6