-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Hi Colin,

Am Fr den 26. Aug 2016 um 10:40 schrieb Colin Clark:
> I've accidentally pushed something onto the master at github. I did not 
> realise I could do this - I didn't think I had write access.

Sure you have. :-)

> Now the geeqie.org and github repositories are out of sync.
> 
> What's the best solution? If I simply delete the last commit on github 
> will that make things better or even worse?

Well, I force pushed now the master from origin. So they are back in
sync. (git push github +origin/master:master)

As this keeps others that have already cloned the wrong version in the
need of manual "git remote update" and to force theire own master to be
in sync with that, this is not the best solution but the only one in
such cases I think. (Well, we could made some forward and backward
merging with reverts in between but this does nothing good here.)

But I think, not that many coned or pulled in between and the real
master ist the one on geeqie.org.

Regards
   Klaus
- -- 
Klaus Ethgen                                       http://www.ethgen.ch/
pub  4096R/4E20AF1C 2011-05-16            Klaus Ethgen <kl...@ethgen.ch>
Fingerprint: 85D4 CA42 952C 949B 1753  62B3 79D0 B06F 4E20 AF1C
-----BEGIN PGP SIGNATURE-----
Comment: Charset: ISO-8859-1

iQGcBAEBCgAGBQJXwBppAAoJEKZ8CrGAGfasfp8L/RparvT6VEARwK9DyR6cI+i7
cuYAuEUY/joD3ZmnSJ2YOVfIqa8bCNPs7ZkJLMN773UO1GyTzeDFG5hRqXJY++3Q
znxitBd4kG8Vr3graB20aTBjfh5z0Se/L/uwwIy0SLrBCzRYOfA7dmJa+h1Je5MS
Qv5r6ao6cuZd7xLnFoSd4uAyH7RiArLBT9sN0CV2nn95nyVabEaw56Hy2rJkMV6C
yQiHn4ArnDVnyjLEEyZX139ija912XL+qPFjjzGYk6imPoa32nzBfKwiopW9yZTY
Uv9bmO7EY6BRMLfFAtq51EHEvsJ6ZT8b6a0+3FPesgaBbxzKTuRQrXNvOSwSO4iS
c9cP+TKNB7V+MAISWaoUhkQZmyssNtWzGctPmDnDsAGnXF49WpHKKStXc06wi4H1
ycvMLPpXwnM9SiO2oAw2iYdusmgzoaNLVwOkTSrCogDcmHbm88PWav7N5C23LxfK
2GkAz8OyMbJ+8rixqrpke8i1X2lmeFGtcLD4rS0ZAQ==
=egoz
-----END PGP SIGNATURE-----

------------------------------------------------------------------------------
_______________________________________________
Geeqie-devel mailing list
Geeqie-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geeqie-devel

Reply via email to