[tei-council] issues on Schematron and deprecation

Sebastian Rahtz sebastian.rahtz at it.ox.ac.uk
Thu Jan 9 18:07:18 EST 2014


On 9 Jan 2014, at 23:03, Syd Bauman <s.bauman at NEU.EDU> wrote:

> Thanks, Hugh.
> 
>> git add extract-isosch.xsl
>> git commit -m "Your commit message."
>> git pull —rebase origin master      #make sure your commit gets written on top of any remote commits
>> git push origin master #commit in the svn sense
> 
> But do I really want write on top of remote commits? If you or
> Sebastian has updated the file while in the meantime, I don't just
> want to clobber what you've done.

I confess, I dont understand that 3rd command

why not do 

	git pull

first, to make sure you’re up to date?
--
Sebastian Rahtz      
Director (Research) of Academic IT
University of Oxford IT Services
13 Banbury Road, Oxford OX2 6NN. Phone +44 1865 283431

Não sou nada.
Nunca serei nada.
Não posso querer ser nada.
À parte isso, tenho em mim todos os sonhos do mundo.



More information about the tei-council mailing list