Skip to content

sandbox: conflict base #6

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: conflict base #6

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
6 changes: 3 additions & 3 deletions _test_data/sandbox/conflict/shared.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
conflict scenario
owner: sandbox-trunk-drift
resolution: trunk drift version
marker: 44caee2
owner: sandbox-conflict-base
resolution: parent branch version
marker: 00e3fde
Loading