[tei-council] issues on Schematron and deprecation

[Hugh Cayless]

You won't, unless we've edited the same lines of the same file, and then you probably want yours to win anyway. 

Sent from my phone. 

> On Jan 9, 2014, at 18: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.
> -- 
> tei-council mailing list
> tei-council at lists.village.Virginia.EDU
> http://lists.village.Virginia.EDU/mailman/listinfo/tei-council
> 
> PLEASE NOTE: postings to this list are publicly archived