Sign up
gitcafe
/
zed
Code
Issues
Pulls
CI
Stacks
Search
Branches
Tags
Code
Issues
Pulls
CI
Stacks
Search
Branches
Tags
More
View stargazers
0
Sign up
Code
Split conflicts into their own section (#24324)
Unverified
Co-Authored-By: Mikayla <mikayla@zed.dev> Release Notes: - N/A
0a70627f00
Conrad Irwin committed on 2/6/2025, 1:34:14 AM
· committed by GitHub
parent
5d1c568
Files Changed
13 files changed
Line totals unavailable
Ignore whitespace
Unified
Split
crates
crates
…
collab
collab
…
migrations
migrations
…
20250205232017_add_conflicts_to_repositories.sql
20250205232017_add_conflicts_to_repositories.sql
…
migrations.sqlite
migrations.sqlite
…
20221109000000_test_schema.sql
20221109000000_test_schema.sql
…
src/db
src/db
…
queries
queries
…
projects.rs
projects.rs
…
rooms.rs
rooms.rs
…
tables
tables
…
worktree_repository.rs
worktree_repository.rs
…
git/src
git/src
…
repository.rs
repository.rs
…
status.rs
status.rs
…
git_ui/src
git_ui/src
…
git_panel.rs
git_panel.rs
…
project_diff.rs
project_diff.rs
…
project/src
project/src
…
git.rs
git.rs
…