Re: [tei-council] gittery

https://github.com/TEIC/TEI/tree/lb42-pureodd https://github.com/TEIC/TEI/tree/lb42-pureodd shows the last commit was mine when I set the branch up a month ago. Is it possible you haven’t pushed the branch? Try git push origin lb42-pureodd and your changes should be synced up.

On Sep 28, 2015, at 16:55 , Lou Burnard wrote:

Eh? I think all the pure ODD P5 changes are checked into that branch

lou@foxglove:~/Public/TEI-Pure$ git status On branch lb42-pureodd Your branch is up-to-date with 'origin/lb42-pureodd'.

But this is just the changes to P5. I haven't checked in any of my changes to the Stylesheets yet, since a lot of them are just me futzing around getting diagnostics to see what's going wrong. If you cd P5, and then do a make clean; make html-web and look at the resulting specs you will see what the problem is.

On 28/09/15 20:56, Hugh Cayless wrote:

...

Lou, I was going to take a look at PureOdd’s stylesheet issues, but it looks like you haven’t pushed the relevant changes to the lb42-pureodd branch yet. Can I help? I’d like to try to get an idea of what will be involved in fixing it.

Thanks, Hugh

...

On Sep 28, 2015, at 12:39 , Lou Burnard wrote:

Ah, scrub that. I realised I am doing things in the wrong order. In my simple and svn-addled mind "commit" is the last thing you do, after pushing, whereas in git world we have to commit (locally) before we can push. Sigh.

I am still puzzled though. What does this mean?

remote: This repository moved. Please use the new location: remote: https://github.com/TEIC/TEI.git To https://github.com/TEIC/Guidelines.git a52bda5..4dd842a master -> master

It doesnt seem to matter, since my change shows up, but what am I doing wrong?

On 28/09/15 17:23, Lou

...

I'm sorry... I'm still dazed and confused.

1. I clone a fresh copy of P5. 2. I change one file 3. I say "git push" 4. It thinks for a bit and then says "everything up-to-date" 5. I say "git commit" 6. It says "Your branch is up to date." However, it's noticed the file I changed but says it's not "staged for commit".

Why doesn't "git push" "stage it for commit"?

On 28/09/15 17:07, Hugh Cayless wrote:

...

...

On Sep 28, 2015, at 11:51 , Lou Burnard wrote:

I have a clone of the main repo in my folder TEI. I say "cd TEI; git status" It says "your branch is up to date with origin/master" There are no changes in your working directory (i.e. new commits) that you haven’t pushed up to origin (Github). It’s not checking against what’s actually at origin, which may have changed since you last updated.

...

I say "git pull" It splurges a gazillion updates at me.

Che?

I believe one or two of Martin’s recent updates affected a lot of files, so there’s going to be a lot of output.

...

-- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council

PLEASE NOTE: postings to this list are publicly archived -- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council

PLEASE NOTE: postings to this list are publicly archived

-- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council

PLEASE NOTE: postings to this list are publicly archived