This repository has been archived by the owner on Mar 11, 2024. It is now read-only.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A test to see whether a PR to the non-migrated files (a change to
pkgs/applications/misc/hello/default.nix
) will give a merge conflict once the files are migrated (where it should now go topkgs/unit/he/hello/pkg-fun.nix
).Result: Nope :(
But:
git merge <default-branch>
andgit rebase <default-branch>
work locally without having to resolve any conflicts manually, so not too bad.