From: Necdet Y. <nec...@gm...> - 2014-12-12 23:29:54
|
[GIT] pull failed (['git', '--git-dir', u'/var/www/pootle/repos/pcmanfm-qt/.git', 'pull']): Pull is not possible because you have unmerged files. Please, fix them up in the work tree, and then use 'git add/rm ' as appropriate to mark resolution, or use 'git commit -a'. --- Necdet Yücel http://about.me/nyucel |
From: Martin B. / b. <br...@bs...> - 2014-12-17 09:21:59
|
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 On 2014-12-13 00:29, Necdet Yücel wrote: > [GIT] pull failed (['git', '--git-dir', > u'/var/www/pootle/repos/pcmanfm-qt/.git', 'pull']): Pull is not > possible because you have unmerged files. Please, fix them up in > the work tree, and then use 'git add/rm ' as appropriate to mark > resolution, or use 'git commit -a'. Indeed. For some reason someone changed the Arabic translation file in both Pootle and git. The hard part for anyone not speaking Arabic is to correct the issue. Cleared the dirty state of the working directory. git.lxde.org is down for pushes as it seems though. - -- brother http://sis.bthstudent.se -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBCAAGBQJUkUslAAoJEJbdSEaj0jV705sIAIOxn7oIs7DsFuXG88RlntEN U+iu7AKAjYYGTGF47P47uSROp5ok1Oz8oJeQb644YAW1lPsWWdShPjwTXU16Tivq yvvLQjobiuZZ/1XtgpDTUdBb5b3lKDE7vUkgYOCDsSYXHJHIltQ45QhIz82IaGjJ mRJS6nk7njobiT3JvQjniRAD5f2TxHxKoqoJayQUtaHprkgPmC5bzIaLtSia3Gpq IVpmJxIQE0MyjdjXs8q+QJXyruDir8gAKJdt66oiSwxwnBtKINSCLY+MIxxUqANF G4O9DQPJVrjB9TeJWDgo5aHqdHYGiH40a9zyMYHkHSXNp7p5IaCHvMXrgNRAMPs= =X8j+ -----END PGP SIGNATURE----- |
From: Jerome L. <ad...@gm...> - 2014-12-17 09:25:29
|
Hi, I pinged the other sysadmins about the git.lxde.org issue with no answer - ssh is down, the server itself is up. Unfortunately I am out of the country until the 26th so I can't do anything about it until then, someone else has to take care of it. J. Leclanche 2014-12-17 10:21 GMT+01:00 Martin Bagge / brother <br...@bs...>: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA256 > > On 2014-12-13 00:29, Necdet Yücel wrote: >> [GIT] pull failed (['git', '--git-dir', >> u'/var/www/pootle/repos/pcmanfm-qt/.git', 'pull']): Pull is not >> possible because you have unmerged files. Please, fix them up in >> the work tree, and then use 'git add/rm ' as appropriate to mark >> resolution, or use 'git commit -a'. > > Indeed. For some reason someone changed the Arabic translation file in > both Pootle and git. > The hard part for anyone not speaking Arabic is to correct the issue. > > Cleared the dirty state of the working directory. git.lxde.org is down > for pushes as it seems though. > > - -- > brother > http://sis.bthstudent.se > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1 > > iQEcBAEBCAAGBQJUkUslAAoJEJbdSEaj0jV705sIAIOxn7oIs7DsFuXG88RlntEN > U+iu7AKAjYYGTGF47P47uSROp5ok1Oz8oJeQb644YAW1lPsWWdShPjwTXU16Tivq > yvvLQjobiuZZ/1XtgpDTUdBb5b3lKDE7vUkgYOCDsSYXHJHIltQ45QhIz82IaGjJ > mRJS6nk7njobiT3JvQjniRAD5f2TxHxKoqoJayQUtaHprkgPmC5bzIaLtSia3Gpq > IVpmJxIQE0MyjdjXs8q+QJXyruDir8gAKJdt66oiSwxwnBtKINSCLY+MIxxUqANF > G4O9DQPJVrjB9TeJWDgo5aHqdHYGiH40a9zyMYHkHSXNp7p5IaCHvMXrgNRAMPs= > =X8j+ > -----END PGP SIGNATURE----- |