latest 20 messages by escherial
+
[2020-04-05T11:59:25Z]
escherial
nedbat: sounds reasonable, thanks
+
[2020-04-05T11:52:52Z]
escherial
not that i'd approve of them doing that, but honestly i don't have much control over what they do
+
[2020-04-05T11:52:32Z]
escherial
what if they merge the first, then merge the second? i assume nothing bad would happen since the initial commits of the second would have already been applied in the first
+
[2020-04-05T11:51:45Z]
escherial
aha, that makes sense
+
[2020-04-05T11:51:12Z]
escherial
nedbat: hrm, i've already submitted the first PR...do i close that one now and create the next one later...?
+
[2020-04-05T11:48:21Z]
escherial
would it be a bad idea to make a branch off my initial PR, do the extra work there, then submit a PR for that other branch later on, once the first one gets merged?
+
[2020-04-05T11:47:57Z]
escherial
hey, i have a PR that i don't think is going to be reviewed in the near future, but i have changes for a second PR that kind of depend on the first
+
[2020-02-18T11:37:03Z]
escherial
thanks for the help
+
[2020-02-18T11:36:54Z]
escherial
well, i'll have to see what the guy who created these branches wants to do about them...he's in a different timezone, so i assume i'll get an answer in a few hours or so...
+
[2020-02-18T11:36:22Z]
escherial
Seveas: aha, yikes
+
[2020-02-18T08:01:13Z]
escherial
that's why i'm surprised that it's goofing up with my machine and github...let me check my case sensitivity setting, one sec
+
[2020-02-18T08:00:37Z]
escherial
i believe we're all using case-sensitive filesystems (OS X and linux)
+
[2020-02-18T08:00:26Z]
escherial
Seveas: right, of course; i don't know who did this, but i suspect it's someone higher up in the hierarchy than me
+
[2020-02-17T11:59:52Z]
escherial
if i attempt to push, it tells me everything is up to date, then when i status it informs me i'm up-to-date. if i pull again, i'm back at being ahead by 8 commits
+
[2020-02-17T11:59:29Z]
escherial
anyway, the first time i git pull and then status, it notifies me that i'm ahead of "API" by 8 commits (which i would be if it were comparing my local branch to the remote "api" one)
+
[2020-02-17T11:58:51Z]
escherial
i've ensured that my local API branch is tracking origin/API by running git branch -vv and checking the remote-tracked branch
+
[2020-02-17T11:58:19Z]
escherial
ok, so "api" and "API" differ by 8 commits on github; on my local machine, when i pull it always notifies me that there's a new branch: api -> origin/api
+
[2020-02-17T11:56:41Z]
escherial
i'm trying to pin down specifically what's going wrong, sorry for the vague complaint so far...
+
[2020-02-17T11:54:15Z]
escherial
hey, i'm not sure how this happened, but there are two branches on this github repo that differ only by capitalization and it's wreaking havoc on my local machine (OS X)
+
[2019-04-09T15:43:40Z]
escherial
dmlloyd: yeah, that sounds reasonable; thanks. most of the time we delete the smaller PRs, but this one's kind of involved and i guess it was unclear if the original issue had been completely addressed...