The Rebasing Adventure: Chapter 1

-

The Rebasing Adventure: Chapter 1

There was an island deep deep far far away, hidden away. It was littered with dangerous and poisonous snakes. Green snakes. Pythons? In the middle of that island there was a little red wooden shack on top of the hill. And in that shack lived... me. 

And in order to escape the valley of the snakes littered afraid all over the little island and to make the desert island safe again... I had to learn REBASING. At least that's what I told myself anyway.

A small crescent island covered with trees and a steep hill in the middle of a bright blue empty sea.
Brazil's real-life 'snake island'.

Must it really have to be as scary as that?

The rebasing journey so far

My work values neat, ordered commits. This makes it easier for the developer reviewing your pull request to handle it. So you want your code to be in atomic commits - each code does one thing and is self contained. Each commit should also do things properly - no commits going back and randomly fixing things and breaking things.

So the problem here is that this requires rebasing.

I did try and cover rebasing with a lot of Senior devs at my previous workplace. But 2,3 of them... we couldn't make it click. This is unusual for me.

Maybe I am just overcomplicating it. "He who controls the past masters the future". To take a George Orwell quote...

Rebasing is just a tool to re-write your commit history... 

Steps so far:

I paired with a senior developer from work online:

It was really amazing as he showed me lots of his stuff. He said that we could pair again when it was actually my turn to do something. He also said that we could pair again when he was doing something similar again, but slightly different. He helped me to get more of the context around WHAT REBASING ACTUALLY IS - re-writing the past - AND WHY WE ACTUALLY DO IT. Most of all it was interesting just to watch him in process and watch him work. I FEEL AS IF ALL OF THE INFORMATION AND CONTEXT OF WHAT HE ACTUALLY DID WILL BE ABSORBED IN TIME.

I asked on two Slack channels:

I asked on my team one, especially for pairing opportunities.

As a result 
  • I paired with the amazing Senior developer above - it was so awesome :-)))
  • I will pair with another Junior next month
  • I got sent some useful links - I will post these to my daily personal log, as these are internal channels
    • Note today's date
    • 22/4/24
WE HAVE TWO INTERNAL NOTION PAGES THAT LOOK USEFUL. I WILL SAVE THESE FOR MYSELF.

I also asked on the general company questions channel:

  • I get sent sent some really useful commands that I will save on my Slack threads, for reference they are
    • git rebase -i
    • git reset --soft main
    • Specifically:
      • One technique is to use: git rebase -i
      • Another is to:
        • Rebase onto latest master/main
        • git reset --soft main to reset to main with no commits
        • unstange changes and restage in chunks to make the commits look better
  • Some people like to use GitKraken for the GUI
    • I got told PyCharm has great GUI tools, but I don't get PyCharm. 😭

Other tips:

  • A staff engineer told me to "make a copy of your branch so you don't get too nervous about messing things up."
  • He also said something I love: "I would also suggest pairing". I LOVE PAIRING!!! Thanks.

The principal engineer sent me his blog:

Later on...


I just got so confused so I asked a lovely Senior Software Engineer who was sitting next to me in the office. :-)

Asking the senior software engineer next to me

Replaying your commits on top of your target branches HEAD.

(Any branch - the HEAD is the top of branch).

He recommended this page





Here's a nice long page:







Comments

Post a Comment

Popular posts from this blog

Hello World

-
Image
 Hello from Susanna Codes! Hi everyone,  My name is Susanna and I'm a 28-year-old aspiring software engineer from Brighton! As I type this, listening to music from "Le Fabuleux Destin d'Amelie Poulain" (it reminds me of home, in Luxembourg, where I am from - I'm missing home quite a lot lately!) and look forward to some Irish Cream tea in my afternoon break, I am thinking: How lucky I am that my amazing colleague Rosana helped me out with a plan for my software engineer journey (she directed me to the front-end first). How HTML and CSS would not have been my first languages of choice had I not been guided in this direction, as in my head they were seen as 'less-serious' langages. How done I am with what other people think of me and if other people see the 'front-end' as softer then so be it! Everyone has to start somewhere. I am so grateful to be on this journey, with Codecademy's Front-End Engineer Career Path.  Thank you to Async Brighton as ...
Read more

Yosemite

-
Image
Yosemite I'll never forget the first time I head the song Yosemite by Lana del Rey. I very nearly clicked away.  It was quite near the start of my Software Engineering journey, right near when I start learning the Front-End/Web Development. I was listening to Arcadia by LDR before, maybe twice, and then Blue Banisters came on. I nearly clicked away in the first 30 seconds but I forced myself to keep listening anyway.  I'll never forget how that song has made me feel. It became my song of 2022 even though I only discovered it in November. I can still listen to it every day and get that complete sense of wonder and of awe that I felt the first time that I heard it. That ending of the song is completely amazing, and it just completely just blows me away every time. "Withstanding all the time, changes, and seasons..." - LDR Concise Body Arrow Functions Why am I so bad at arrow functions? Whyyyyyyyyyyy?  Just kidding, I am beginning to get them. But why are they so hard? ...
Read more

Where To Hide A Star

-
Image
Where To Hide A Star I haven’t read this book but I just saw this title of a forthcoming children’s book on the train and so I wanted to write a blog post based off of this as well. The last six months have been… rewarding and fulfilling. I have managed to make all of my dreams come true and to defy expectations,  Sometimes the best place to hide is in plain sight and if you reread all of my blogs over the last six months (all 200 of them) you would know exactly what I’m struggling at work and what was going on. And why. But I’ve managed to overcome most of my challenges. Neurodiversity. Being very new in the field relative to the expectations of the job. Being in a new workplace environment. All stuff which I can handle and I am doing just fine. Because I am amazing and fabulous and I can do anything. I am loving the job. I am thriving. I am loving just getting on with it. I love my work. I am having massive breakthroughs. On Thursday I had what felt like the biggest breakthrough ...
Read more