Can someone please define for me exactly what "clean history" means? I see at least four different components that people have mentioned: 1) commit (on master) == feature or commit == bugfix (i.e. squashing) 2) commit messages are written and formatted correctly 3) avoidance of "messy merges" (define, please?) 4) avoidance of parallel branches other than at the tip (i.e. rebasing) I think the first two are fine. But in the ideal case, wouldn't feature == ticket and bug == ticket, so commit (on master) == ticket merge? I think the third is quite avoidable but does not *require* the fourth. So I guess maybe I'm saying the problem really starts earlier, with too much being done on each ticket. -- Kian-Tat Lim, LSST Data Management, [log in to unmask] ######################################################################## Use REPLY-ALL to reply to list To unsubscribe from the QSERV-L list, click the following link: https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=QSERV-L&A=1