Skip to content

Navigation Menu

Appearance settings

Explore
By company size
By use case
By industry
View all solutions
Topics
- AI
- DevOps
- Security
- Software Development
- View all
Explore
- GitHub Sponsors
  Fund open source developers
- The ReadME Project
  GitHub community articles
Repositories
- Enterprise platform
  AI-powered developer platform
Available add-ons
Pricing

Search code, repositories, users, issues, pull requests...

Search

Clear

Search syntax tips

Provide feedback

We read every piece of feedback, and take your input very seriously.

Include my email address so I can be contacted

Saved searches

Use saved searches to filter your results more quickly

Name

Query

To see all available qualifiers, see our documentation.

Appearance settings

You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session. You switched accounts on another tab or window. Reload to refresh your session.

Dismiss alert

GitoxideLabs / gitoxide Public

Notifications You must be signed in to change notification settings
Fork 377
Star 10.2k

Code
Issues 142
Pull requests 13
Discussions
Actions
Projects 1
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Discussions
Actions
Projects
Security
Insights

tree-merge follow-up#1651

Merged

Byron merged 10 commits intomainGitoxideLabs/gitoxide:mainfrom

mergeGitoxideLabs/gitoxide:mergeCopy head branch name to clipboard

Nov 5, 2024

Conversation Commits10 (10)Checks Files changed

Merged

tree-merge follow-up#1651
Byron merged 10 commits intomainfrom
merge

Commits

Commits on Nov 5, 2024

remove a TODO that turned out to be unnecessary.
Byron
committed
feat: add `Conflict::is_unresolved()` as utility to see if multiple of them are considered unresolved.
Byron
committed
feat: add `Object::peel_to_commit()` to assure an object turns into a commit.
Byron
committed
feat: add `Repository::index_or_load_from_head_or_empty()`.
Byron
committed
feat: add `objects::tree::Editor::detach()` to get the underlying editor back.
Byron
committed
feat!: `Repository::merge_trees()` now has a fully-wrapped outcome.
Byron
committed
fix!: rename `blob-merge` feature to `tree-merge`.
Byron
committed
adapt to changes in `gix`
Byron
committed
feat!: `Repository::merge_trees()` now takes portable version of `Options`.
Byron
committed
adapt to changes in `gix`
Byron
committed

Footer

© 2025 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Docs
Contact

You can’t perform that action at this time.