fix: configure ours merge driver for pixi.lock

[blooop]

Summary

• merge=ours in .gitattributes is not a built-in git merge driver (built-ins are only text, binary, union). Without defining it, git falls back to the text driver and still reports conflicts on pixi.lock.
• Adds git config merge.ours.driver true to devcontainer postCreateCommand, which defines the custom merge driver so pixi.lock conflicts auto-resolve by keeping "ours".

Test plan

• Verified without the driver config: merge reports CONFLICT and fails
• Verified with the driver config: merge completes cleanly (exit 0), keeps "ours" content, no conflict markers

🤖 Generated with Claude Code

Summary by Sourcery

Build:

• Add devcontainer post-create git configuration to register the custom 'ours' merge driver used for pixi.lock.

[sourcery-ai]

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Configures a custom Git merge driver for pixi.lock within the devcontainer so that merges automatically keep the local version and avoid conflicts, aligning the container environment with the project’s .gitattributes settings.

File-Level Changes

Change	Details	Files
Define and apply a custom Git merge driver (merge=ours) for pixi.lock in the devcontainer so merges auto-resolve by keeping the current branch’s version.	Extend the devcontainer postCreateCommand to run git config merge.ours.driver true, registering the custom ours merge driver inside the container. Ensure the configured merge driver works with the existing .gitattributes rule for pixi.lock, so that Git no longer uses the default text merge behavior for that file.	.devcontainer/devcontainer.json

---

Tips and commands

Interacting with Sourcery

• Trigger a new review: Comment @sourcery-ai review on the pull request.
• Continue discussions: Reply directly to Sourcery's review comments.
• Generate a GitHub issue from a review comment: Ask Sourcery to create an
  issue from a review comment by replying to it. You can also reply to a
  review comment with @sourcery-ai issue to create an issue from it.
• Generate a pull request title: Write @sourcery-ai anywhere in the pull
  request title to generate a title at any time. You can also comment
  @sourcery-ai title on the pull request to (re-)generate the title at any time.
• Generate a pull request summary: Write @sourcery-ai summary anywhere in
  the pull request body to generate a PR summary at any time exactly where you
  want it. You can also comment @sourcery-ai summary on the pull request to
  (re-)generate the summary at any time.
• Generate reviewer's guide: Comment @sourcery-ai guide on the pull
  request to (re-)generate the reviewer's guide at any time.
• Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
  pull request to resolve all Sourcery comments. Useful if you've already
  addressed all the comments and don't want to see them anymore.
• Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
  request to dismiss all existing Sourcery reviews. Especially useful if you
  want to start fresh with a new review - don't forget to comment
  @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

• Enable or disable review features such as the Sourcery-generated pull request
  summary, the reviewer's guide, and others.
• Change the review language.
• Add, remove or edit custom review instructions.
• Adjust other review settings.

Getting Help

• Contact our support team for questions or feedback.
• Visit our documentation for detailed guides and information.
• Keep in touch with the Sourcery team by following us on X/Twitter, LinkedIn or GitHub.

[sourcery-ai]

Hey - I've reviewed your changes and they look great!

---

Sourcery is free for open source - if you like our reviews please consider sharing them ✨

• X
• Mastodon
• LinkedIn
• Facebook

_{Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.}