The Official First World Problems Thread™
-
Even Starbucks doesn't charge $4
There's better coffee out there than Starbucks. (It gets much pricier when you go for the really good stuff, but it's delicious.)
-
Ok; even in Seattle in the mecca of expensive coffee at the most trendy coffeeshop, plain coffee doesn't go for $4 a cup.
-
FWP: When I was rudely awakened at 2am, my phone decided I lived in California again and set itself three hours off from local time. I had to set an alarm on my husband's phone because fuck if I was going to figure that out at 2am.
-
FWP: travis-ci aotu updates and pushes documentation to my repo now.... i'm not used to this so the number of times i commit before i pull means that i'm causing a lot of merge commits with the text:
Merge branch 'es6-dev' of github.com:SockDrawer/SockBot into es6-dev
... not that that's necessarily a bad thing, it is inflating my commit count.... but i should know better by now!
-
GET 1701
<valid
-
FWP: i'm grandfathered on my cloud9 ide premium plan... every month i experience a moment of cognitive dissonance when looking at my invoice
PAID IN FULL Plan: Medium Total Due: 39.00$ Paid: 19.50$
-
FWP: travis-ci aotu updates and pushes documentation to my repo now.... i'm not used to this so the number of times i commit before i pull means that i'm causing a lot of merge commits with the text:
Merge branch 'es6-dev' of github.com:SockDrawer/SockBot into es6-dev
... not that that's necessarily a bad thing, it is inflating my commit count.... but i should know better by now!
git config branch.master.mergeoptions "--ff-only"
fixes that. Changemaster
to whatever branch you want git to prevent you from making merge commits.If you've already committed and then pulled after that, you should be able to
git rebase origin/master
(again, changemaster
(andorigin
) as appropriate) to get the history straight again.
-
or i could just get into the habit of pulling after travis pushes new docs. just as i should as if he was a real collaborator.
-
or i could just get into the habit of pulling after travis pushes new docs. just as i should as if he was a real collaborator.
Sure, but what do you trust more: your muscle memory/habits or the system right out preventing you from doing something questionable?
I have reasonable trust in my natural biorhythm to wake up in time to get to work, but I set my alarm clock anyway, just in case ;)
-
your muscle memory/habits or the system right out preventing you from doing something questionable?
the system over my muscle memory.
honestly it's not that much of an issue. i never edit
README.md
,docs/contributors.md
, ordocs/api/**/*.md
directly because those are all autogenerated by the build process, so there's never a merge conflict from Travis, so it's at worst a minor annoyance to push code, have it rejected because i'm out of date, then pull, pressESC:wq
to accept the auto merge message, then push again.and i sure as copulation do not trust myself to rebase properly every time.
-
and i sure as copulation do not trust myself to rebase properly every time.
Given how dangerous rebasing can be, that's a good attitude to have ;)
-
@accalia said:
and i sure as copulation do not trust myself to rebase properly every time.
Given how dangerous rebasing can be, that's a good attitude to have ;)I was talking about plain rebase, not interactive rebase.
Rebasing is only dangerous if you rewrite history that's already been pulled someone else. If you're rebasing commits you only have locally, rebasing has zero risk.
I was just throwing it out there as a suggestion, btw :) If @accalia has a workflow that suits her well enough, move along, nothing to see here then.
Linear history (what rebasing gets you) or non-linear history (what merge commits get you) is mostly a matter of taste, there is no objectively better choice between the two.
-
If you're rebasing commits you only have locally, rebasing has zero risk
but i'm not. i might technically be the committing user in both cases, but it's not on the same computer. i commit on one computer, push to github, travis-ci picks it up, builds the docs, commits them, and pushed back to github.
it's still a linear flow so rebase would work really well, but i'll still take the minor annoyance of the merge commits over risking it with rebase.
;-)
-
githu[b]g[/b]
The world's first friendly source control hosting serviceAlso, something you'll never see Blakey do
-
Might explain why he has so many problems with it ...
-
@OffByOne said:
If you're rebasing commits you only have locally, rebasing has zero risk
but i'm not. i might technically be the committing user in both cases, but it's not on the same computer. i commit on one computer, push to github, travis-ci picks it up, builds the docs, commits them, and pushed back to github.
Either I'm misunderstanding something or we're not talking about the same thing.
My understanding is:
- What you posted above happens (I've abused <ins> tags to mark what I'm referring to)
- You make some new commits on your local system, without pulling from github (so the docs from Travis are on github, but not your local repo)
- You decide to push the commits you've created in step 2., so do a
git push
- After much kyonning and yipping at yourself, you create a merge commit to unite the github-with-travis'-docs and the commits you've made in 2.
My proposed solution was: instead of step 4. as described above, you rebase the commits you created in step 2. on github-with-travis'-docs (kyonning and yipping optional, they won't screw your repo )
This is entirely undangerous, because those commits from step 2. haven't left your local system. You won't screw anyone over if you rewrite their genealogy.
Since the commit made by Travis only touches files you never touch anyway, you're guaranteed to not have any merge conflicts during rebase either.In commands: instead of your "
git pull
; accept auto merge message;git push
", you could "git fetch
;git rebase origin/master
1;git push
".
1 substitute the correct branch name here, of course
-
My understanding is:
What you posted above happens (I've abused <ins> tags to mark what I'm referring to)
You make some new commits on your local system, without pulling from github (so the docs from Travis are on github, but not your local repo)
You decide to push the commits you've created in step 2., so do a git pushAfter much kyonning and yipping at yourself, you create a merge commit to unite the github-with-travis'-docs and the commits you've made in 2.
well it's more gekkering than kyoning and yipping, but otherwise pretty accurate
git rebase origin/master
git rebase origin/HEAD
might work? i know HEAD is a special name that's the head of the current branch...hmph.... i'll think about it next time i forget.
-
@OffByOne said:
After much kyonning and yipping at yourself, you create a merge commit to unite the github-with-travis'-docs and the commits you've made in 2.
well it's more gekkering than kyoning and yipping, but otherwise pretty accurate
I speak 4 languages, Fox ain't one of them
@OffByOne said:
git rebase origin/master
git rebase origin/HEAD
might work? i know HEAD is a special name that's the head of the current branch...You could rebase on
origin/HEAD
, but I'm not sure it is what you think it is. See http://stackoverflow.com/questions/354312/why-is-origin-head-shown-when-running-git-branch-r for an explanation.If you rebase on
origin/<branch_you_want_your_commits_to_go_to>
, what happens will always be what you expect to happen.Take care to
git fetch
1 instead ofgit pull
2 though.
1git fetch
fetches the latest commits from the remote (duh!), but doesn't apply them to your local repo yet. It does update where yourorigin/<foo>
branches point to though, that's why you can rebase onorigin/<foo>
.2 Conceptually (and maybe under the hood too, CBA to check)
git pull
equalsgit fetch
followed bygit merge
.
-
git pull equals git fetch followed by git merge.
more or less, yes. ;-)
I speak 4 languages, Fox ain't one of them
well then. time to pick up a 5th? ;-)
-
@OffByOne said:
I speak 4 languages, Fox ain't one of them
well then. time to pick up a 5th? ;-)Will do eventually, but I don't think it will be Fox.
I'm still deciding between1: Polish (try 2, I took a year already, but that was 5 years ago, so I'd rather just start from scratch again), Russian, Japanese, Klingon, Lojban.
Of those, the first three obviously have the most practical value.
Klingon looks like a fun challenge.
Lojban I find interesting because of the logical way it's constructed. If I ever decide to learn Lojban, I promise not to spam the forums
Maybe I should make a poll and let you guys "help"?
-
They fixed the drinking fountain down the hall from where I work. Although it no longer drenches the floor and unsuspecting passersby, it takes significantly longer to fill water pitchers.
-
[quote="accalia, post:1717, topic:4285]
git rebase origin/master
git rebase origin/HEAD
might work? i know HEAD is a special name that's the head of the current branch...hmph.... i'll think about it next time i forget.
[/quote]
-
interesting.... but it's written in ruby.....
donotwant.png
-
Still better than JavaScript .
-
---___---
riiiight.
if you say so.
-
-
yes, i was fully aware of that. can a fox not roll with a joke?
-
Weird I thought that whole trowel thing was tenuous at best.
-
would have been had this been the first time i'd seen it used so.
alas it was not the first time and so i was ready for its tricks
-
Not sure if I mentioned but my work provided Windows phone cannot get Strava so I have to use a 3rd party app, Striver, which works perfectly.
If I start recording my ride with the GPS switched off the app advises me and takes me to the GPS settings page to switch it on.
FWP: after returning to the app recording has not started and I have to click the record icon again.
-
FWP: My dog was goofing around last night and ran over my bare foot, tearing a line across the base of three toes. Hurt like hell, especially relative to the amount of actual damage it caused (i.e., not terribly a lot).
-
The cleaner didn't vacuum in the lounge because I was having a nap on the couch so I had to do it myself after she left
-
I thought done of you might like to seed the carnage. Spoilered as trigger earning for anyone who might be grossed out by minor injuries or pasty-white skin. [spoiler] [/spoiler]
ETA: the spoiler tag is case-sensitive.
-
Image loads then 5 seconds later spoilers.
-
Now I have a hat that only fits if I put it on at a certain angle. If I am feeling particularly dapper, I'd need a different hat.
-
-
In commands: instead of your "git pull; accept auto merge message; git push", you could "git fetch; git rebase origin/master1; git push".
What's wrong with
git pull --rebase
?Set it up to always do this:
git config branch.master.rebase true
And make this always happen for new branches:
git config --global branch.autosetuprebase true
Some blog: http://stevenharman.net/git-pull-with-automatic-rebase
cc: @accalia
-
What's wrong with
git pull --rebase
?Nothing. I just didn't know about that option.
Set it up to always do this:
git config branch.master.rebase true
And make this always happen for new branches:git config --global branch.autosetuprebase true
That's going right in my
.gitconfig
. Thanks!
-
What's wrong with git pull --rebase?
nothing, but it's not as awesome as
git up
-
https://pypi.python.org/pypi/git-up
I'm really happy for you and Imma let you finish, but I'm not installing Python just for that.
I'm on Windows at work otherwise I'd already have it installed
-
do you prefer ruby?
also this from the installation section of the readme:
Windows support is predictably absent.
why the fuck is that a thing to be proud of?!
-
why the fuck is that a thing to be proud of?!
Because people like him are assholes.
It's like JWZ: "xscreensaver will never exist for Windows, because Microsoft killed my company." No, fucktard, the idiots in charge of your company killed it.
-
FWP: customer emails me: "I had to change the commandline to use the database server's IP instead of host name and now it won't work."
I didn't get as far as why you felt you had to do that yet, I'm still waiting for "well, what was the error you got?"
-
FWP: lady who usually makes my takeout salads figured she give me a treat for being a regular and, without me noticing, added shrimp to my chicken salad.
It resulted in me going back to check if she got the order right. Plus, I don't like shrimp.
-
She either has a thing for you or hates you and hopes you're allergic.
-
It's like JWZ: "xscreensaver will never exist for Windows, because Microsoft killed my company."
He thinks MICROSOFT killed Netscape? Jesus, I used to think he was a smart guy.
Netscape committed suicide. That would have happened whether or not IE existed. He's written about all the horrible missteps they made in Netscape 4 like 50 times on his blog, and he thinks Microsoft killed Netscape?
-
Netscape committed suicide.
This one?: http://www.joelonsoftware.com/articles/fog0000000069.html
-
-
He thinks MICROSOFT killed Netscape?
"There is no Windows version of xscreensaver, and there never will be. Please stop asking. Microsoft killed my company, and I hold a personal grudge. I don't use any Microsoft products and neither should you."
If I weren't too lazy I'd be tempted to try to port it.
-
-
Microsoft already has a better screensaver,
-
Nobody uses screensavers anymore anyway.
EDIT: I just checked, and Windows 8.1 still ships the screensaver code. They've reduced the number of savers that get shipped with the OS to 6, one of which is "blank" which seems especially pointless.
-