Activity log for bug #923665

Date Who What changed Old value New value Message
2012-01-30 10:28:24 Jelmer Vernooij bug added bug
2012-01-30 10:29:10 Jelmer Vernooij description with colocated branches in place, it is becoming increasingly annoying that directories get conflicted when switching between branches. It would be nice if it was possible to specify a list of "junk" file extensions of files that can be safely removed. with colocated branches in place, it is becoming increasingly annoying that directories get conflicted when a merge removes them and they still have unversioned files. This happens quite often when switching between branches. It would be nice if it was possible to specify a list of "junk" file extensions of files that can be safely removed.
2017-11-09 00:28:00 Jelmer Vernooij tags colocated conflicts check-for-breezy colocated conflicts