<luis>
drmeister: I've squashed your pull request. How's your git-fu? Let me know if you have trouble with it. (Please don't push a merge commit. :-)
_whitelogger has joined #slime
makomo_ has joined #slime
jonatack has quit [Ping timeout: 276 seconds]
jonatack has joined #slime
jonatack has quit [Client Quit]
jonatack has joined #slime
scymtym has joined #slime
makomo_ has quit [Ping timeout: 268 seconds]
makomo_ has joined #slime
<drmeister>
My git-fu is weak.
<drmeister>
I have a few patterns (push, pull, checkout) that I follow but I am not comfortable outside of that.
<drmeister>
So where are we right now?
<drmeister>
What does "squashed your pull request" mean?
<drmeister>
luis: Ping
<ck_>
drmeister: squashing commits means 'merging' multiple commits into a single one. Your pull request was merged.
<drmeister>
I see - thank you.
<ck_>
for more context: squashing is an operation during a rebase, where you can reorder commits, drop individual ones, change the commit messages and so on. The idea is to have the history in a more clean state, a linear one, without commits like "merge branch xzy from abc" that have multiple parents
<luis>
drmeister: but because you've submitted your pull request from your master branch you'll need to update it a bit differently than you're probably used to. git pull --rebase should do the trick.
frgo has quit []
<luis>
drmeister: that will try to apply your commits on top of the new slime master, and it'll notice that they're redundant
<drmeister>
I was going to nuke my local copy and clone fresh from your original - is that ok?
<drmeister>
I see - I also have a fork that I'd need to nuke - it's different from yours.
<drmeister>
This is where git makes me very, very nervous. I can't tell you how many times I've screwed things up and spent hours-days cleaning up.
<drmeister>
I'm going to wipe out my fork and the local clone that I used to make these changes. I don't have the mental bandwidth to deal with git at the moment.
<luis>
drmeister: I understand that. Nuking is of course fine.
<luis>
git's got a very steep learning curve. I've helped many, many coworkers migrate to git. I've seen all sorts of chaos and confusion.