chiark
/
gitweb
/
~ian
/
topbloke-formulae.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
cdbdcb9
)
merge fixes/clarifications - clarify Non-Topbloke merges
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 16 Mar 2012 21:55:51 +0000
(21:55 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 16 Mar 2012 21:55:51 +0000
(21:55 +0000)
merge.tex
patch
|
blob
|
history
diff --git
a/merge.tex
b/merge.tex
index f153811f3e7864b0ebad85fb3db274f9adc96099..555523648032b9548b6eea604d4a9292ff0e3bd2 100644
(file)
--- a/
merge.tex
+++ b/
merge.tex
@@
-59,7
+59,9
@@
branch without Topbloke's assistance, it is also forbidden to
merge any Topbloke-controlled branch into any plain git branch.
Given those conditions, Tip Merge and Merge Acyclic do not apply.
-And $Y \not\in \py$ so $\neg [ Y \haspatch \p ]$ so neither
+And by Foreign Contents for Y, $\forall_{\p, D \in \py} D \not\le Y$
+so then by No Replay $D \not\isin Y$
+so $\neg [ Y \haspatch \p ]$ so neither
Merge Ends condition applies.
So a plain git merge of non-Topbloke branches meets the conditions and