Sebastian Thiel

octopus-merge (part 5: tree-merge-ORT three-way)

1

Three-way merging of trees. Follow-up of #1612. ### Tasks * [x] baseline tests for tree-merging * [x] successful first tree-merge without conflicts * [ ] make all tests pass *(catch-all...

Having learned from `gix` it should now be possible to have a command-oriented `fetch` that is similar to `gix_protocol::ls_refs()`. Motivated by #1319, as these changes should allow `heartwood` to use...

### Version 0.13.1 ### Operating System macOS ### Distribution Method dmg (Apple Silicon) ### Describe the issue The UI enters this state. ### How to reproduce * Clone https://github.com/alexcrichton/cmake-rs.git and...

### Version 0.13.1 ### Operating System macOS ### Distribution Method dmg (Apple Silicon) ### Describe the issue After not touching the GitLab repository for a while, it's very far behind....

follow-up for `ref-info`: more reliability

2

There are still a lot of fatal flaws resulting in errors and even panics. These should be fixed and it should 'generally' be working. Write critical tests only. Follow-up on...

Linux Distribution Compatibility

23

Currently our distributables require Ubuntu 24 at the very least to have a chance to run, and by the look of https://github.com/tauri-apps/tauri/issues/9039 there are more caveats as to which distributable...

Better FE Error on nonexclusive project access

1

This way it's possible for the UI to correctly explain what's going on. ### Tasks * [x] backend makes lock-error distinguishable * [ ] frontend uses this new Code variant

This issue is based on a feature request [on Discord](https://discord.com/channels/1060193121130000425/1073202153163857920/1368929828333551718). As part of the 'good gitizen' initiative, having an idea on how to integrate git tags seems like a feature...

Investigate "failed to fill whole buffer" when updating the workspace

1

From [Discord](https://discord.com/channels/1060193121130000425/1206670506271707156/1362104551653769587) > Hello, I've an issue that appeared today in GitButler, I cannot update the workspace with upstream commits anymore, it fails with the message: `failed to fill whole...

Merge-commit <hash> can't be remerged if none of its parents was seen in the rebase

1

From [Discord](https://discord.com/channels/1060193121130000425/1204524097241878629/1367081276963688520). > Not sure if this already came up: When I try to update my workspace (via the Update button), I get an error with the following message: `Merge-commit...