Re: [tei-council] September Telecon

You have two choices if you want to work on something in another branch. You can, as Lou has, make a second copy of the repo and have it use the master branch. This makes decent sense for what Lou is doing I think, given his need to have master to hand as a reference while he works on Pure. Most people though, if they want to work on a different branch, just do git checkout master #or sydb-xenodata, or whatever you want in your repo, and then you have a working copy of whatever branch you want. Your other branch is still there, and perfectly safe. If you have uncommitted changes, then git will ask you nicely to please do something about them (probably commit them) before you switch branches. If you’re not sure which branch you’re on, git status will tell you. You can create a new branch anytime you want: git checkout -b mynewbranch If you want to get your branch up-to-date with master, there are two options. Your choice will depend on what you’ve been doing. If you have only a small number of changes in your branch, unlikely to conflict with anything, then you can run git rebase master #after you’ve checked out sydb-xenodata which will essentially pretend you branched off the current HEAD of master rather than wherever you originally did, and replay your commits on top of that. If you have a situation where you’ve changed files and master has changed the same files, you should probably do a merge: git merge master This may result in your having to do a merge commit, which git will set up for you. If there’s a conflict, you’ll need to resolve it and then commit your changes. Conflicts are marked just as they are in svn.

On Sep 23, 2015, at 22:02 , Syd Bauman wrote:

I don't think it's an agenda item for tomorrow, but at some point someone is going to have to either a) merge changes from master (and whatever else) into syd-xenodata, or b) show me how to do that, or better yet c) both.

In order to get a version of syd-xenodata/ I could work on, I ditched my entire TEI repo and re-cloned. I then copied P5/Makefile over from the master branch to the syd-xenodata/ branch and changed the definition of ${VCS} from "svn" to "git". I was then at least able to build on the xenodata branch.

What am I supposed to do to work on something other than xenoData? Is the expectation that I'll generate a new branch to work on, say, the tweaks needed to discussion of language tags?

...

I’ve started a draft agenda at https://docs.google.com/document/d/1oz3MpPLyslDUudj33Tn_q9YH8j0hFei0sd8ChTcD... -- 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