latest 20 messages by dmlloyd
+
[2020-07-14T16:56:05Z]
dmlloyd
ah additional opers, excellent
+
[2020-06-30T12:32:58Z]
dmlloyd
that adds a commit though, it doesn't remove one
+
[2020-06-30T12:32:45Z]
dmlloyd
if you own the branch
+
[2020-06-30T12:32:40Z]
dmlloyd
you could revert it, maybe
+
[2020-06-30T12:32:21Z]
dmlloyd
not that I know of...
+
[2020-06-26T16:05:33Z]
dmlloyd
though tbh it could; they just haven't done so, probably because you're more likely to push to the wrong name by mistake than to want to actually create a repo
+
[2020-06-26T16:04:57Z]
dmlloyd
yeah pushing doesn't create the repository
+
[2020-06-23T22:00:43Z]
dmlloyd
if you want to remove a branch, `git push foo :branchName`
+
[2020-03-12T18:18:56Z]
dmlloyd
for future reference though, github is more intuitive with branches that are periodically rebased on upstream than with branches that are periodically merged with upstream
+
[2020-03-12T18:18:09Z]
dmlloyd
then you're probably fine
+
[2020-03-12T18:16:41Z]
dmlloyd
as long as the git history makes sense, it should be OK
+
[2020-03-12T18:16:34Z]
dmlloyd
hopefully ;)
+
[2020-03-12T18:15:47Z]
dmlloyd
so then it's just like.. ¯\_(ツ)_/¯
+
[2020-03-12T18:15:36Z]
dmlloyd
and sometimes the answer is "both"
+
[2020-03-12T18:15:25Z]
dmlloyd
so to reason what branch is the "base" branch you have to follow all the parents back until you find one or more commit(s) from the "base" branch - and then decide which path is shorter
+
[2020-03-12T18:14:13Z]
dmlloyd
(for example combining multiple projects into one)
+
[2020-03-12T18:14:02Z]
dmlloyd
we've had merges with many many parents in the past :)
+
[2020-03-12T18:13:40Z]
dmlloyd
merges don't really have base branches; they just have more than one parent
+
[2020-03-12T18:12:32Z]
dmlloyd
if you manually merge it, and push that up, github should automatically close the PR as "merged"
+
[2020-03-12T18:12:14Z]
dmlloyd
IIRC it's just the UI that's confused but to be safe you might want to manually merge that PR and double check that it looks git-okay