latest 13 messages by ericP
+
[2016-12-09T09:47:49Z]
ericP
Seveas, tx. do you concur with my suggestion that the command line listing separate the commit step?
+
[2016-12-09T08:09:49Z]
ericP
is there a place for such feedback?
+
[2016-12-09T08:09:35Z]
ericP
my guess it that most people who are doing a manual commit want to be able to review the changes. I think adding --no-commit would save a lot of people looking up how to reset the head and do the merge again with --no-commit
+
[2016-12-09T08:08:07Z]
ericP
pull reqs, e.g. <https://github.com/shexSpec/spec/pull/2>, have a "command line instructions" link which displays merge text like "git merge --no-ff labra-gh-pages".
+
[2016-08-17T21:53:50Z]
ericP
that particular commit appears to preceed the one that went to the wrong branch
+
[2016-08-17T21:52:51Z]
ericP
jhass, it's that damned eric hacker. i'll kick his ass
+
[2016-08-17T21:23:22Z]
ericP
?
+
[2016-08-17T21:23:12Z]
ericP
what should i look for to see if i commited that directly to ShEx3 (which I shouldn't have) vs. commiting it to TEisSE and then merging it back to ShEx3 (which i also shouldn't have)
+
[2016-08-17T21:22:15Z]
ericP
it says that change was 5 days ago but i wouldn't have expected i would have passed any tests in those 5 days so i suspect that i fat-fingred a merge or something
+
[2016-08-17T21:21:07Z]
ericP
specifically, https://github.com/shexSpec/shexTest/commit/514e999120d106d4cbaad02840b87c1a0b900a81
+
[2016-08-17T21:20:42Z]
ericP
i very recently (last few mins) see changes in ShEx3 that i expected to stay in TEisSE
+
[2016-08-17T21:20:21Z]
ericP
i routinely merge from master to ShEx3 and then to TEisSE
+
[2016-08-17T21:19:34Z]
ericP
i have a branch (TEisSE) of branch (ShEx3)