Re: [tei-council] dtd jabberwock slain?

On Sep 1, 2015, at 21:49 , Syd Bauman wrote:

...

Nope. Master is a branch, origin is a remote (i.e. A nickname for another repo). You could, of course, have a branch named origin and a remote named master, but that would be perverse.

Boy, I really wish there were conventions to make names (or nicknames) of remotes obviously different from names (or nicknames) of branches. Like remotes always all uppercase, branches all lower case. Maybe my head would spin less that way.

If it would make you feel better, there is nothing stopping you from doing "git remote rename origin ORIGIN".

What is the process to merge changes that have occurred in the past few weeks on the master branch of P5 into the sydb-xenodata branch?

I presume it's something like

$ cd ~/Documents/ # already done $ git clone https://github.com/TEIC/TEI.git # already done $ cd TEI/ $ git checkout sydb-xenodata $ git merge master # ?? $ git commit -m "merge w/ master" $ git push # ??

But would really like some hand-holding, here.

That would do it, though unless you have to resolve a conflict, the merge commit will be set up for you—mine just pops me into vi. You’ll just need to edit the message (or not). The way I set up sydb-xenodata, it may mostly have been done.

-- Syd "guess the GIT book is my bedtime reading tonight" Bauman

-- 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