Skip to content

sandbox: overlap child #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
roodboi wants to merge 1 commit into from
Closed

sandbox: overlap child #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions _test_data/sandbox/overlap/shared.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ Parent branch owns this section and introduces the file.

## Section B

This section will be edited by the child branch.
Child branch rewrites this section to create same-file stacked diffs without a guaranteed merge conflict.

Marker: 00e3fde
Marker: 17a0f9c
Loading