Learn More
Resend Email
27
ieatvegetables
6y

My progression of learning git rebase:

Year 1: WTF just happened?! Where is my code?! *deletes and re-clones repo*

Year 2: Ok if I do it suuuper carefully I can get the other dev's one-line change into my branch...shit...shit...wait...fuck...oh lol it worked.

Year 3: Oh yeah let me organize my commits real quick. *drop pick pick squash reword pick fixup drop pick* *git push -f* 😎

rant

unlimited power

git rebase
Favorite
Ranter
Comments
  • 13
    6y
    Me
    Year 1: let me just drop these files on the github web interface

    Year 93828: let me just drop these files on the github cognitive interface
  • 1
    6y
    If it's just 1 commit you're after, you can do ```git cherry-pick hash_of_the_commit_you_want``` and it'll pull that into your current branch.
  • 7
    6y
    *git push -f* oh no...
  • 1
    6y
    Im in year 1.5...
  • 1
    6y
    @carlosjpc oh that's just a staging year.
  • 1
    6y
    @mjones44 @Bitwise after rebasing a feature branch (onto current master or just to clean up) I find this very reasonable
  • 1
    6y
    *git push -fuck-the-rest-of-the-team*
Related Rants
devRant © 2021 Hexical Labs LLC
Privacy Policy  |  Terms of Service
Add Comment