Scott Taylor

No settings available

4

I'm using IntelliJ IDEA Community Edition 2016.2.4 and there are no settings in the Tools section for this plugin

`Str.split` and `List.split` have different behavior

5

I was using a `Str` and I wanted to convert my code to work on some ASCII bytes directly with a `List U8`, so I tried switching from `Str.split` to...

FR: Command for resetting change ID

8

**Is your feature request related to a problem? Please describe.** If there are multiple commits with the same change ID and I want to keep both versions of them for...

Panic in `jj op show` on "reconcile divergent operations"

1

## Description I was messing around with divergent operations to see how `jj` handles abandoning a commit while also trying to edit it concurrently, and I found this crash in...

rebase: skip duplicate divergent commits by default

2

This is a partial fix for #5381 and #2979. It doesn't handle the general case (it only detects duplicate changes between divergent commits with the same change ID), but I...

conflicts: add conflict labels to `MergedTree` and store in backends

1

#1176 I split this PR off of #7692 because I think these changes could be reviewed separately to figure out the storage of conflict labels before we go into the...

conflicts: add labels to conflicts

5

Resolves #1176. This PR just adds labels for merges and rebases, since these are the most common sources of conflicts. After this PR, I'll add conflict labels to other sources...

conflicts: prefer emitting snapshot for first side

4

Often, the diffs for the first side and second side are approximately the same size, so we have the choice of whether we want to emit a snapshot for the...

Allow selecting hidden/divergent changes using change ID

3

Resolves #7028. If anyone wants to try it out and see how it feels, it's available as `scott2000/change-generation` in the `jj` repo. Log with divergent: Evolog with hidden commits: Evolog...

#7917 # Checklist If applicable: - [X] I have updated `CHANGELOG.md` - [ ] I have updated the documentation (`README.md`, `docs/`, `demos/`) - [ ] I have updated the config...