Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

generate nixos options documentation #379

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Conversation

Mic92
Copy link
Owner

@Mic92 Mic92 commented Aug 11, 2023

No description provided.

@Mic92 Mic92 force-pushed the generate-nixos-docs branch 2 times, most recently from c86e98b to 6a972a5 Compare August 11, 2023 16:31
@Mic92
Copy link
Owner Author

Mic92 commented Sep 21, 2023

@mergify rebase

@mergify
Copy link
Contributor

mergify bot commented Sep 21, 2023

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/2)
Auto-merging default.nix
CONFLICT (content): Merge conflict in default.nix
error: could not apply 7c0c4e4... generate nixos options documentation
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 7c0c4e4... generate nixos options documentation

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant