<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<div class="moz-cite-prefix">On 2/24/14, 1:54 AM, Daniel Murphy
wrote:<br>
</div>
<blockquote
cite="mid:CAMU72LEE4cCUexEayp9aX5Gox6Sefig2E7RDOP45ekuSuRQF2Q@mail.gmail.com"
type="cite">
<div dir="ltr">I don't think merging back into master is feasible
at this point. We have been merging fixes to master first, then
cherry-picking/rebasing them to the release branch, and I don't
think a merge to master is necessary or desirable with this
model.</div>
<div class="gmail_extra"><br>
<br>
<div class="gmail_quote">On Mon, Feb 24, 2014 at 5:46 PM, Andrew
Edwards <span dir="ltr"><<a moz-do-not-send="true"
href="mailto:edwards.ac@gmail.com" target="_blank">edwards.ac@gmail.com</a>></span>
wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0
.8ex;border-left:1px #ccc solid;padding-left:1ex"><br>
Merger of all branches with master were successfull with
exception of DMD and PHOBOS.<br>
<br>
Following are the conflicts that will be encountered for
DMD:<br>
seireitei:dmd ace$ git merge 2.065<br>
Auto-merging test/runnable/xtest46.d<br>
CONFLICT (content): Merge conflict in
test/runnable/xtest46.d<br>
Auto-merging test/runnable/aliasthis.d<br>
CONFLICT (content): Merge conflict in
test/runnable/aliasthis.d<br>
Auto-merging src/typinf.c<br>
CONFLICT (content): Merge conflict in src/typinf.c<br>
Auto-merging src/traits.c<br>
CONFLICT (content): Merge conflict in src/traits.c<br>
Auto-merging src/template.h<br>
Auto-merging src/template.c<br>
CONFLICT (content): Merge conflict in src/template.c<br>
Auto-merging src/struct.c<br>
CONFLICT (content): Merge conflict in src/struct.c<br>
Auto-merging src/parse.c<br>
CONFLICT (content): Merge conflict in src/parse.c<br>
Auto-merging src/mtype.h<br>
CONFLICT (content): Merge conflict in src/mtype.h<br>
Auto-merging src/mtype.c<br>
CONFLICT (content): Merge conflict in src/mtype.c<br>
Auto-merging src/interpret.c<br>
CONFLICT (content): Merge conflict in src/interpret.c<br>
Auto-merging src/inline.c<br>
CONFLICT (content): Merge conflict in src/inline.c<br>
Auto-merging src/glue.c<br>
CONFLICT (content): Merge conflict in src/glue.c<br>
Auto-merging src/func.c<br>
CONFLICT (content): Merge conflict in src/func.c<br>
Auto-merging src/expression.h<br>
CONFLICT (content): Merge conflict in src/expression.h<br>
Auto-merging src/expression.c<br>
CONFLICT (content): Merge conflict in src/expression.c<br>
Auto-merging src/e2ir.c<br>
CONFLICT (content): Merge conflict in src/e2ir.c<br>
Auto-merging src/dsymbol.h<br>
CONFLICT (content): Merge conflict in src/dsymbol.h<br>
Auto-merging src/doc.c<br>
CONFLICT (content): Merge conflict in src/doc.c<br>
Auto-merging src/declaration.h<br>
CONFLICT (content): Merge conflict in src/declaration.h<br>
Auto-merging src/ctfeexpr.c<br>
CONFLICT (content): Merge conflict in src/ctfeexpr.c<br>
Auto-merging src/cast.c<br>
Auto-merging src/attrib.c<br>
CONFLICT (content): Merge conflict in src/attrib.c<br>
Automatic merge failed; fix conflicts and then commit
the result.<br>
<br>
Following are the conflicts that will be encountered for
PHOBOS:<br>
seireitei:phobos ace$ git merge 2.065<br>
Auto-merging std/traits.d<br>
CONFLICT (content): Merge conflict in std/traits.d<br>
Auto-merging std/algorithm.d<br>
CONFLICT (content): Merge conflict in std/algorithm.d<br>
Automatic merge failed; fix conflicts and then commit
the result.<br>
<br>
I have aborted these mergers so am not yet sure what the
actual conflicts are or how time-consuming resolution will
be.</blockquote>
</div>
</div>
</blockquote>
<br>
</body>
</html>