Byte Block

[Sahn Lam @sahnlam]

Git Merge vs. Rebase vs. Squash Commit

What are the differences?

When we 𝐦𝐞𝐫𝐠𝐞 𝐜𝐡𝐚𝐧𝐠𝐞𝐬 from one Git branch to another, we can use ‘git merge’ or ‘git rebase’. The diagram below shows how the two commands work.

𝐆𝐢𝐭 𝐌𝐞𝐫𝐠𝐞
This creates a new commit G’ in the main branch. G’ ties the histories of both main and feature branches.

Git merge is 𝐧𝐨𝐧-𝐝𝐞𝐬𝐭𝐫𝐮𝐜𝐭𝐢𝐯𝐞. It introduces a new commit to the main branch without altering the existing commits in either branch.

𝐆𝐢𝐭 𝐑𝐞𝐛𝐚𝐬𝐞
Git rebase transplants the feature branch histories to the tip of the main branch. It creates new commits E’, F’, and G’ for each commit in the feature branch.

The benefit of rebase is that it has 𝐥𝐢𝐧𝐞𝐚𝐫 𝐜𝐨𝐦𝐦𝐢𝐭 𝐡𝐢𝐬𝐭𝐨𝐫𝐲.

However, be cautious: abide by the 𝐆𝐨𝐥𝐝𝐞𝐧 𝐑𝐮𝐥𝐞 𝐨𝐟 𝐆𝐢𝐭 𝐑𝐞𝐛𝐚𝐬𝐞 — Never use it on shared branches to avoid confusing collaborators.

𝐆𝐢𝐭 𝐒𝐪𝐮𝐚𝐬𝐡 𝐂𝐨𝐦𝐦𝐢𝐭 (not shown)

Squashing condenses multiple commits into one, streamlining the commit history.

When to use each one is a bit nuanced. We have a YouTube video to explain it clearly. Link in comment below.

–
Subscribe to our weekly newsletter to get a Free System Design PDF (158 pages): https://t.co/kNfv0DVDdf

[Alvaro Cintas @dr_cintas]

DALL•E 3 is finally available to ALL ChatGPT pro users!

In celebration, I’ve handpicked and curated the finest examples…

10 incredible use cases for you to try:

[DAN KOE @thedankoe]

You feel terrible because your subconscious knows you could be doing better. A thread:

[DAN KOE @thedankoe]

"You can't solve a problem with the same mind that created it." - Albert Einstein

[Dr. Nicole LePera @Theholisticpsyc]

Growing up, I never witnessed an adult who could regulate their emotions.

I saw yelling, and the silent treatment, and complete avoidance.

I saw small situations become a crisis.

I saw shame stop us from speaking about the realities going on around us.

I learned the way to deal with uncomfortable emotions was to eat them away. Then shame ourselves for gaining weight.

I learned that what people thought was more important than how we felt.

I learned that codependency enabling and caretaking was love.

I knew I wanted to become someone who could

I decided that I would stop subscribing to self sacrifice as a noble act, and I would learn how to emotionally regulate.

I decided I would teach myself how to create true partnership. One where we encouraged each other to be better and supported each other's mutual freedom to be ourselves.

I decided I would focus on building a life that aligned with my values, rather than trying to please every person around me.

We can all consciously create who we want to become.

[Gwart @GwartyGwart]

Vitalik , Hayden, and Justin Drake were walking one day when they noticed a $100 bill on the sidewalk. Vitalik picked it up and said, “we should use this to build public goods and core infrastructure.” Hayden nodded his head, “agreed, we can put this money to good use.”

[Muzzammil @DevMuzzammil]

Huge ChatGPT CheatSheet

[Byte Block @TheByteBlock]

@elonmusk long shot here, but I accidentally sent 2 aweth, an erc-20 token, to @paypal and they will not exchange or refund my money!
@VitalikButerin can someone with power please help me resolve this.

[Byte Block @TheByteBlock]

@elonmusk lone shot here but I accidentally sent 2 aweth, an erc-20 token, to @paypal and they will not exchange or refund my money! @VitalikButerin can someone with power please help me resolve this.

[Bytebytego @bytebytego]

Linux file system explained.

The Linux file system used to resemble an unorganized town where individuals constructed their houses wherever they pleased. However, in 1994, the Filesystem Hierarchy Standard (FHS) was introduced to bring order to the Linux file system.

By implementing a standard like the FHS, software can ensure a consistent layout across various Linux distributions. Nonetheless, not all Linux distributions strictly adhere to this standard. They often incorporate their own unique elements or cater to specific requirements.

To become proficient in this standard, you can begin by exploring. Utilize commands such as "cd" for navigation and "ls" for listing directory contents. Imagine the file system as a tree, starting from the root (/). With time, it will become second nature to you, transforming you into a skilled Linux administrator.

Have fun exploring!

Over to you: What Linux commands are useful for navigating and examining files?

--
Subscribe to our weekly newsletter to get a Free System Design PDF (158 pages): https://t.co/RibM5u7UxP

[Dr. Nicole LePera @Theholisticpsyc]

How to develop emotional maturity:

Practice "don't join them."

Observe someone being highly reactive or trying to trigger you and just notice. Stay in your body. Notice you don't need to join their emotional state.

Empower yourself to disconnect. To walk away.

Emotionally mature people don't take on the emotions of those around them. They ground in their own.

[Dan Go @CoachDanGo]

This 4 minute lower back drill will change your life.

It's estimated that 80% of people in the western world will experience back problems.

The causes of low back pain can be multifactorial but a good number of them are due to having a weak core and a weak set of glutes.

Let's fix that.

This 4 minute drill was designed to strengthen the core and glutes in a safe way.

It involves the McGill Big 3 and the body weight hip thrust.

If you suffer from low back pain do these on a daily basis. You might change your life as a result.

[The Figen @TheFigen_]

This is great idea...

[Robert Kiyosaki @theRealKiyosaki]

GANG WARFARE: August 22, 2023 approximately 41 nations, possibly even France gang up in South Africa to “de Dollarize” the world. Proposal: BRICS nations will launch “bric” their money. 1 bric = 1 oz of gold=$3,000. Bye bye USA.

[Wisdom Stoics @WisdomStoics]

11 Life Lessons From The Book "The Alchemist"

1.

[Pinch of Yum @pinchofyum]

Cucumber Agua Fresca! Cucumber, lime, mint, lemongrass, sugar, and honey. The perfect tart + fresh summery drink! https://t.co/Y9qy8qnhng

[karbon 🐺🦊 @karbonbased]

This is what women think men want to talk about

[Essential Mastery @EssentialMastry]

8 Signs You're Probably an Extraverted Introvert...

1.