the-distro/infra
Archived
8
1
Fork 8
Code Issues 40 Pull requests 9 Projects Releases Packages Wiki Activity Actions

Use mergiraf as a merge driver for one-way-sync #154

New issue
Closed
opened 2024-11-14 10:20:55 +00:00 by raito · 2 comments
raito commented 2024-11-14 10:20:55 +00:00
Owner
Copy link

As mergiraf is language-aware, we can hope we can minimize harmless merge conflicts.

For Nix, it would require to load the Nix treesitter support in there.

As mergiraf is language-aware, we can hope we can minimize harmless merge conflicts. For Nix, it would require to load the Nix treesitter support in there.
kfearsoff commented 2025-04-04 09:27:12 +00:00
Contributor
Copy link

Mergiraf supports Nix natively as of 0.6.0: https://codeberg.org/mergiraf/mergiraf/releases/tag/v0.6.0

Nixpkgs Unstable is already updated to 0.6.0

It now needs change to .gitattributes and integration work to configure git config: https://mergiraf.org/usage.html

Mergiraf supports Nix natively as of 0.6.0: https://codeberg.org/mergiraf/mergiraf/releases/tag/v0.6.0 Nixpkgs Unstable is already updated to 0.6.0 It now needs change to `.gitattributes` and integration work to configure git config: https://mergiraf.org/usage.html
raito commented 2025-08-24 00:44:40 +00:00
Author
Owner
Copy link

The Floral project will not be tracked anymore here and is not the priority of AFNix for the immediate future.

The Floral project will not be tracked anymore here and is not the priority of AFNix for the immediate future.
raito closed this issue 2025-08-24 00:44:40 +00:00
Commenting is not possible because the repository is archived.
No Branch/Tag specified
Branches Tags
main
broker-flows
goaccess
alerting-to-zulip
better-backup-monitoring
forgejo-runners-sprinkles
abm
afnix-social-logins
hyp01
benchmarks
afnix-oidc
voidlinux-tenant
x86_builder_v6_only
besadii-release-branches
tom-hubrecht/audit
repair-ofborg
i-wish-i-had-jj-and-gerrit
scheduled-builds
gerrit-hydra
single-node-ceph
storage-project
cache-lix
email-groups
format
No results found.
Labels
Clear labels   
Compat/Breaking

Breaking change that won't be backward compatible

  
Difficulty
Architectural
Requires changes in multiple pieces of the stack: the Nix interpreter, etc.

  
Difficulty
Easy
Infrastructure beginner friendly tasks

  
Difficulty
Hard
Requires prior knowledge, research and design

  
Help Wanted

Looking for a first task to pick? This one is looking for somefew to do it as well!

  
Kind
Bug
Something is not working

  
Kind
Documentation
Documentation changes

  
Kind
Enhancement
Improve existing functionality

  
Kind
Feature
New functionality

  
Kind
Testing
Issue or pull request related to testing

  
Priority
Critical
The priority is critical

  
Priority
High
The priority is high

  
Priority
Low
The priority is low

  
Priority
Medium
The priority is medium

  
Reviewed
Confirmed
Issue has been confirmed

  
Reviewed
Duplicate
This issue or pull request already exists

  
Reviewed
Invalid
Invalid issue

  
Reviewed
Won't Fix
This issue won't be fixed

  
Security

This is a security issue

  
Silenced Alert

This issue was created to track a silenced alert which needs remediation work.

  
Status
Abandoned
Somebody has started to work on this but abandoned work

  
Status
Blocked
Something is blocking this issue or pull request

  
Status
Need More Info
Feedback is required to reproduce issue or to continue work

  
Status
Postponed
We can do this later

  
Tracking Issue

Umbrella issue of many things at the same time

No labels
Compat/Breaking
Difficulty
Architectural
Difficulty
Easy
Difficulty
Hard
Help Wanted
Kind
Bug
Kind
Documentation
Kind
Enhancement
Kind
Feature
Kind
Testing
Priority
Critical
Priority
High
Priority
Low
Priority
Medium
Reviewed
Confirmed
Reviewed
Duplicate
Reviewed
Invalid
Reviewed
Won't Fix
Security
Silenced Alert
Status
Abandoned
Status
Blocked
Status
Need More Info
Status
Postponed
Tracking Issue
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: the-distro/infra#154
No description provided.
Delete branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?