So there is no possibility that if it is rendering poorly in a particular browser it may be the browser's fault instead of the website? Good article, please shut up about the fonts.
How I learned to love rebase
21–30 of 56 posts
Re: How I learned to love rebase
#22Can somebody try to explain what considerations go into picking between merge and rebase, or when rebase is a better option? The example here "you've branched that file and made some changes. Meanwhile, someone else has modified that same file on the master branch..." says 'merge' to me, and I'm not sure what consideration goes into the decision that rebase is the right tool instead. I've tried to google a bit, and r…
You rebase to clean up your own, non-shared, local commit history. That is it. As soon as your commits are shared you can no longer rebase them or feel the wrath. If you don't care about cleaning up your local history, before you share it, then don't rebase.
A merge creates a new commit that doesn't effect history so it's always safe to merge.
Re: How I learned to love rebase
#23 > It's possible to be careful about rebasing code, say by duplicating the master
> branch and rebasing your code on that new version to see if you accidentally
> destroy the world before trying to rebase within the actual master.
Re: How I learned to love rebase
#24Sorry to nag, but I haven't yet brought myself to make it past the first paragraph. Maybe it looks elegant or classy on someone else's screen, but I had to go re-enable Evernote Clearly just to be able to read it. Am I the only one?
Sorry to rant, but I haven't yet brought myself to understand this position. Maybe it makes sense to designers or snobs but I have go calm down for a while just be able to reply. Am I the only person who thinks that ignoring good content to complain about formatting choices is vacuous at best?
Take a look at some of the screencaps below (or mine here: http://i.imgur.com/XpVhDMx.png Chrome/Win7) - this isn't the typical "omg don't use dark gray on light gray". The "t" and "l" are in distinguishable, so it is pretty hard for me to actually read.
I'm sure it looks fine in the authors browser/OS of choice, but it is not usable in mine - regardless of the merits of the content.
Re: How I learned to love rebase
#25Unfortunately rebase doesn't fit well with our team workflow (team is geographically distributed). we use branches and commits to check which user is on which task. everyone pushes code at the end of the day even if it's incomplete. Pushing code prevents rebase usage.
Rebase is really good especially when you are contributing in open source repositories but our experience has been limited in our private repositories.
Re: How I learned to love rebase
#26> It's possible to be careful about rebasing code, say by duplicating the master > branch and rebasing your code on that new version to see if you accidentally > destroy the world before trying to rebase within the actual master. Is it possible to ask 'What would you do if I rebased' without a test branch?
You can always do "git rebase --abort" if you're stuck in the middle of a rebase, or, if you've rebased and don't like it, "git reflog" to find the previous state followed by "git reset --hard " to get back to where you were.
Re: How I learned to love rebase
#27Earlier quoted context omitted.
https://docs.google.com/file/d/0B_sHgQoVOruvTmJjdHlWUTk4dGM/... Ya know what. It looks fine in Firefox, but that font looks like garbage rendered in Chrome. I don't know if it's the font-family or the font-size, but something's making me want to scratch my eyes out or make me want to kill my screen with fire. It's probably an unfair generalization to assume that all female Python developers don't use Chrome.
Wow. I'm on Safari in OS X and it doesn't look anything like that. No wonder you guys are having trouble reading it. http://imgur.com/TAQBRcV I'd rather it just be left at default, but at least it's readable.
Could this be a Windows-only issue? I found that it was unreadable on Firefox 19, Opera 12.02 and Chrome on Windows 7.
Re: How I learned to love rebase
#28Unfortunately rebase doesn't fit well with our team workflow (team is geographically distributed). we use branches and commits to check which user is on which task. everyone pushes code at the end of the day even if it's incomplete. Pushing code prevents rebase usage. Rebase is really good especially when you are contributing in open source repositories but our experience has been limited in our private repositories.
In your scenario, it sounds like you'd be better served by pushing the incomplete work to temporary branches. At least, if I were working with you, I'd rather have working code in master than a bunch of "git commit -am Hometime" dumps.
Re: How I learned to love rebase
#29Sorry to nag, but I haven't yet brought myself to make it past the first paragraph. Maybe it looks elegant or classy on someone else's screen, but I had to go re-enable Evernote Clearly just to be able to read it. Am I the only one?
Indeed. Completely unreadable on both Chrome and Firefox, on Ubuntu. Had to use ireader.
Re: How I learned to love rebase
#30Earlier quoted context omitted.
https://docs.google.com/file/d/0B_sHgQoVOruvTmJjdHlWUTk4dGM/... Ya know what. It looks fine in Firefox, but that font looks like garbage rendered in Chrome. I don't know if it's the font-family or the font-size, but something's making me want to scratch my eyes out or make me want to kill my screen with fire. It's probably an unfair generalization to assume that all female Python developers don't use Chrome.
You're right, it is unfair to generalize that all female Python developers don't use Chrome. Wonder if it looks better on a Mac in Chrome; it looks terrible in Chrome on Windows.
It's just a normal unreadable article in Chrome on OSX. On Chrome on Windows something's broken.