Artifact
835ec31f3930a300b5a3f590641a4130384d855e:
Ticket change
[835ec31f39]
- Review ticket [4df5f38f1e]:
Troubles merging a file delete with a file change plus 3 other changes
by
drh
2011-08-30 14:22:37.
D 2011-08-30T14:22:37.435
J +comment \n\n<hr\s/><i>drh\sadded\son\s2011-08-30\s14:22:37\sUTC:</i><br\s/>\nWhether\sor\snot\sthis\sshould\sbe\sreported\sas\sa\sconflict\sis\sa\smatter\sof\r\nopinion.\s\sTechnically,\swhenever\stwo\speople\smake\sany\schanges\sto\sa\sfile\r\nin\sparallel,\sthe\sresulting\smerge\sis\sa\sconflict.\s\sWe\s<i>choose</i>\snot\r\nto\sreport\sconflicts\sthat\scan\sbe\scleanly\sjoined\stogether.\s\sFor\sexample,\r\nwe\schoose\snot\sto\sreport\sconflicts\swhen\sthe\stwo\sedits\sare\sin\sdifferent\r\nparts\sof\sthe\ssame\sfile.\s\sJust\sbecause\stwo\sedits\shappen\sto\smerge\stogether\r\ncleanly\sand\swithout\soverlap\sdoes\snot\smean\sthat\sthe\sresulting\scode\swill\r\nstill\srun,\safter\sall.\r\n\r\nEven\sedits\sin\sseparate\sfiles\sare\spotentially\sa\sconflict,\ssince\swhile\sboth\r\nedits\smight\swork\sfine\sseparately,\stheir\scombination\smight\smake\sthe\ssoftware\r\nfail.\s\sSo,\stechnically,\sany\sparallel\schange\sto\sthe\sproject\sis\sa\sconflict.\r\nBut\swe\schoose\snot\sto\smake\sa\sbig\sdeal\sout\sof\smost\sof\sthese\sconflicts\ssince\r\nmost\sof\sthe\stime\sthey\sare\sbenign.\r\n\r\nThe\stricky\spart\sin\sa\smerge\salgorithm\sis\sto\sidentify\sand\sannounce\sconflicts\r\nthat\sare\slikely\sto\srequire\sprogrammer\sintervention\sand\sresolution,\sversus\r\nconflicts\sthat\sthe\ssoftware\sis\sprobably\sable\sto\sdeal\swith\sitself.\sYou\sdon't\r\nwant\sto\sannounce\stoo\smany\sconflicts,\sbecause\s-\sas\swith\sthe\sboy\swho\scried\r\n"Wolf!"\s-\susers\squickly\sdevelop\sconflict-fatigue\sand\send\sup\signoring\sreal\r\nproblems.\r\n\r\nIn\sthe\scase\sof\san\sedit/delete\sconflict,\sthe\ssoftware\scurrently\sthinks\s\r\nit\scan\sdeal\swith\sthat\sitself.\s\sIf\syou\swant\sto\sdisagree,\sthen\sgive\sus\r\nsome\sspecific\scases\swhere\sthat\spolicy\scauses\sissues\sand\sargue\syour\scase.\r\nIn\sthe\sabsence\sof\sa\smore\scompelling\srationale,\sI\sdon't\sthink\sthis\scomplaint\r\nwarrants\sany\schanges\sto\sthe\scurrent\smerge\slogic.
J resolution Rejected
J status Review
J type Feature_Request
K 4df5f38f1e564d2970c269bf5ea1d2aec5173dc9
U drh
Z 7c5b8401e7fa4f303fd8929526250b5f