Re: [tei-council] Git question

Ah yes, sorry, I was looking in the wrong place. There they are! How about if I check out this stuff, hack your prose mercilessly, and then check it into the lb42-pure-odd-2 branch for you? (Or into dev, if we've actually managed to merge by then) L On 17/12/15 14:44, James Cummings wrote:

Lou, Basically correct, but I swear I added the specs. Yes, I've just checked here, done a git status and a git push and it says I'm all up to date. they should be in the processing-model branch. On github.com it shows there being a model.xml spec file on the processing-model branch but not on the dev branch, so no, they aren't in dev yet.

In the TD chapter I included the XIncludes to the specs and a new div of prose and the specGrpRef as you noted.

So you are entirely right except your last point.

Thanks for looking at this!

-James

On 17/12/15 13:06, Lou Burnard wrote:

...

James, sfaics in your "processing-model" branch, the only changes are

a) you added a new section #TDPM into chapter TD b) you added a new specGrpRef into section #TDBuild b) you added a bunch of new specs (which are not, however, included in your branch so are presumably already lurking in the dev branch )

Is that right, or am I entirely missing something?

L

On 15/12/15 16:49, James Cummings wrote:

...

That looked so promising. We've both done changes in the TD chapter which it thinks are conflicts (but probably aren't really, I just plopped in a whole new section).

(and for the record rather than sort it out, I just did a new clone of the whole repository. ;-) )

Ok, I think I'll just do my changes again.

Just to double check before I do... it is still best to do them off of the lb42-pureodd-2 branch... right?

-James

On 15/12/15 14:22, Hugh Cayless wrote:

...

There’s a few things you could try. Depends a bit on what you’ve done and how your changes interact with Lou’s.

I think what I’d try first is:

git fetch git checkout lb42-pureodd-2 git checkout your_branch git rebase lb42-pureodd-2

That should re-run the commits you’ve made in your branch on top of the new pureodd branch and hopefully give you a branch that acts like you started from there in the first place.

I'd make a copy of your repo first though, just in case things don’t turn out the way you hope.

...

On Dec 15, 2015, at 9:07 , James Cummings wrote:

Hiya,

Is there a way to copy the changes I've made on one branch to another? Or move one branch (off another branch) to be tracking a different branch instead? (e.g. I made the 'processing-model' branch off of Lou's original lb42-pureodd branch and I want to move it to his current one.)

Suggestions? Or do I have to go do all the changes again?

-James -- Dr James Cummings, James.Cummings@it.ox.ac.uk Academic IT Services, University of Oxford -- 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