Thread (64 messages) 64 messages, 4 authors, 2020-12-15

Re: [PATCH v2 09/11] merge-ort: add implementation of rename/delete conflicts

flat view

From: Derrick Stolee <hidden>
Date: 2020-12-15 14:28:06 

On 12/14/2020 11:21 AM, Elijah Newren via GitGitGadget wrote:
quoted hunk ↗ jump to hunk
 		if (type_changed && collision) {
 			/* special handling so later blocks can handle this */
 			die("Not yet implemented");
+		if (source_deleted) {
I didn't catch this in my earlier message, but the opening brace
of the if (type_changed && collision) gets squashed here, causing
a compiler break.

Thanks,
-Stolee
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help