From e8ab02477159b5bd91a3566dc28367ed4a910b3a Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 11:43:40 +0100 Subject: git-debrebase: merge: Comment about laundry of merge of unstitched I have concluded that this is not a problem avoidable by git-debrebase, and that any trouble will be tolerable (at least, not data loss). The user should try to avoid doing this. Signed-off-by: Ian Jackson --- tests/tests/gdr-merge | 6 ------ 1 file changed, 6 deletions(-) (limited to 'tests') diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge index 25b2ee0..baffedf 100755 --- a/tests/tests/gdr-merge +++ b/tests/tests/gdr-merge @@ -59,12 +59,6 @@ t-git-debrebase scrap t-some-changes after t-git-debrebase -# xxx want to check that we DTRT if we start out unstitched - -# xxx should consider our ffq-prev as a parent -# xxx or should we ? it's not a parent of the merge is it ? -# xxx => user should prefer to make merges when stitched ? -# xxx think about this later - # t-gdr-good laundered # xxx ^ this does not work -- cgit v1.2.3