torios team mailing list archive

[Paul Sutton <zleap@xxxxxxxxxx>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1



On 03/06/15 19:56, Sam Klein wrote:
> Toriosadores,
> 
> I've completed major updates to the torios-manual package. Here is
> my branch for the most cutting-edge updates.
> 
> https://github.com/ruzekle/torios-manual
> 
> For updates that are recognized, go to Paul's: 
> https://github.com/zleap/torios-manual
> 
> Here are new features: - one-button build script - modularized
> build scripts for future maintenance and redesign - modularized tex
> files for more efficient editing/writing
> 
> I'm currently waiting for Paul to get back to me this week, so we
> can merge the new changes to the official repos. Then I will focus
> on bug squashing.
> 
> I hope you're enjoying your week.
> 
> Sam Klein
> 
> 

if I got to my github and select your latest pull request I get the
following
 We can’t automatically merge this pull request.

it says to use the commadn line,  to resolve conflicts before
continuing.  so clicking on that link i have followed the instructions
it has given me,  no idea what it is doing

So having done that I still can't merge pull request from website

Paul

- -- 
http://www.zleap.net @zleap14
Diaspora : https://joindiaspora.com/u/zleap
Documentation lead @ ToriOS http://www.torios.org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEARECAAYFAlVva0UACgkQaggq1k2FJq0PgACbB0bZyIBkdpzZRydRhbwMEyGK
dHkAn0WvM8wzOl57J7AOHhZNXQL7PaBm
=ln7c
-----END PGP SIGNATURE-----