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

doc/manual: Fix some broken fragments (backport #11629) #12195

Open
wants to merge 1 commit into
base: 2.24-maintenance
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 10, 2025

Motivation

Fix 🔧

Context

Priorities and Process

Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.


This is an automatic backport of pull request #11629 done by [Mergify](https://mergify.com).

(cherry picked from commit 071ddbe)

# Conflicts:
#	doc/manual/src/language/operators.md
Copy link
Contributor Author

mergify bot commented Jan 10, 2025

Cherry-pick of 071ddbe has failed:

On branch mergify/bp/2.24-maintenance/pr-11629
Your branch is up to date with 'origin/2.24-maintenance'.

You are currently cherry-picking commit 071ddbed5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   doc/manual/src/command-ref/nix-env.md
	modified:   doc/manual/src/language/derivations.md
	modified:   doc/manual/src/release-notes/rl-2.23.md
	modified:   src/libcmd/installables.cc
	modified:   src/nix/shell.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   doc/manual/src/language/operators.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions github-actions bot added documentation new-cli Relating to the "nix" command labels Jan 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant