Kornel Benko wrote: > Am Samstag, 10. Juni 2017 um 10:41:43, schrieb Georg Baum >> >> I would suggest to use git correctly instead of fixing broken line ends >> again and again, producing huge nonsense diffs. We had this discussion >> several times in the past. >> > > Maybe a problem in merging and pushing from windows. > Scenario to merge: > #: src/frontends/qt4/ui/BiblioUi.ui:244<CR><LF> > with > #: src/frontends/qt4/ui/ColorUi.ui:73<CR><LF> > results in > #: src/frontends/qt4/ui/BiblioUi.ui:244<CR> > src/frontends/qt4/ui/ColorUi.ui:73<CR><LF> and after push the last > <CR><LF> is converted to <LF>
Probably. However, this does not happen with a correctly configured git: On windows, both .ui and .po use windows line ends, on unix both .po and .ui use unix line ends, so merging works fine in both cases. The merge script works with windoes line ends IIRC, as long as all files use them. Georg
