Re: [tei-council] GitHub Repo import

It should, except that the way you had your branches set up meant the Git branch came over as P5, which contains a directory "for-xenodata". That means your directory structure won’t quite be in parallel and merging will be difficult. I’d be inclined to set up a new branch sydb-xenodata* and then copy your stuff into that. If the directories are all parallel, then merging can happen cleanly. What will happen now if you merge back into master is that master will end up with an extra for-xenodata directory in it. *We’d talked about designating personal branches like this so that other people know who’s working on them. Does this still seem like a good idea?

On Aug 30, 2015, at 20:21 , Syd Bauman wrote:

Like Lou, I'm feeling like a cat. Will this same process work for me to merge the changes that have occured in .../trunk/P5/ to .../branches/P5/for-xenoData/? (I had hoped to do that earlier today and put <xenoData> on the agenda for tomorrow's call, but I hadn't realized we weren't still using SF until I read this thread.)

I'd try it now, but I'm getting pretty tired ... -- 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