freenode/#slime - IRC Chatlog
Search
15:43:30
drmeister
I have a few patterns (push, pull, checkout) that I follow but I am not comfortable outside of that.
15:49:26
ck_
drmeister: squashing commits means 'merging' multiple commits into a single one. Your pull request was merged.
15:51:34
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
15:58:52
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.
15:59:34
luis
drmeister: that will try to apply your commits on top of the new slime master, and it'll notice that they're redundant
16:01:59
drmeister
I was going to nuke my local copy and clone fresh from your original - is that ok?
16:04:05
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.
16:05:22
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.
16:08:37
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.