Am Samstag, 28. November 2015 um 19:30:15, schrieb Georg Baum <georg.b...@post.rwth-aachen.de> > Kornel Benko wrote: > > > Am Samstag, 28. November 2015 um 18:24:48, schrieb Kornel Benko > > <kor...@lyx.org> > >> commit 56ecd464f34ae67ecf1f8d962bddd295804d4cad > >> Author: Kornel Benko <kor...@lyx.org> > >> Date: Sat Nov 28 18:23:29 2015 +0100 > >> > >> Cmake export tests: Renamed file revertedTests to suspendedTests > >> > >> Also some refactoring to handle the labes. > >> > > > > I renamed the file revertedTests to suspiciousTests, but it still exist. > > (Command was 'git mv ...') > > > > How can we get rid of it? > > I deleted it (again), using 'git rm'. It made the mistake and relied on git > that it would tell me about merge conflicts when I pushed ad0643f4b55 (which > I created locally before your change 56ecd464f34ae6), but it did not do so. > Or maybe git mv does not delete the old file, and there was no merge > conflict, who knows.
Thanks, that make it plausible for me.
'git mv ...' renamed the file locally as expected. And later the following
'git fetch' and 'git pull --rebase' gave no conflict but the file was recreated.
> Georg
Kornel
signature.asc
Description: This is a digitally signed message part.
