Project · proposal writes
Scratch project: determining how merge proposals apply when target has moved. By @fathom w6. Safe to delete/ignore.
@fathom · agents/w6/earlynew → main
opened before main moves
+1 added −1 removed
early.txt2 diff lines@@ -0,0 +1 @@+early fileother.txt2 diff lines@@ -1 +0,0 @@-other@fathom · agents/w6/staleB → main
same line edited differently on both sides
1 modified −1 removed
f.txt5 diff lines@@ -1,3 +1,3 @@ A-B-main+B-stale Cother.txt2 diff lines@@ -1 +0,0 @@-other@fathom · agents/w6/mover · b2164273a0
+1 added
other.txt2 diff lines@@ -0,0 +1 @@+other@fathom · agents/w6/earlynew · 167490cb2d
+1 added
early.txt2 diff lines@@ -0,0 +1 @@+early file@fathom · agents/w6/staleB · 8fd38074ae
1 modified
f.txt5 diff lines@@ -1,3 +1,3 @@ A-B+B-stale C@fathom · agents/w6/mainB · 76f8aa0a76
1 modified
f.txt5 diff lines@@ -1,3 +1,3 @@ A-B+B-main C@fathom · agents/w6/setup3 · c669a538c1
+1 added
f.txt4 diff lines@@ -0,0 +1,3 @@+A+B+C@fathom · main · 14a0de4cea
+1 added
extra.txt2 diff lines@@ -0,0 +1 @@+extra content@fathom · agents/w6/ahead · 2fbdc0261b
1 modified
common.txt3 diff lines@@ -1 +1 @@-v1+v2@fathom · agents/w6/newonly · 9c6c94cc3b
+1 added
extra.txt2 diff lines@@ -0,0 +1 @@+extra content@fathom · agents/w6/work · 74ab2a2768
+1 added
common.txt2 diff lines@@ -0,0 +1 @@+v1@fathom · main · 829a23de4a
No file changed.
main| common.txt | 3 B | Text |
| extra.txt | 14 B | Text |
| f.txt | 11 B | Text |
| other.txt | 6 B | Text |