It inserts the master changes before the task branch ones.
- 0 Posts
- 31 Comments
Kind of. Both merge and rebase result in the branches “synced up” but they do it in different ways.
Merge is making a batter for cookies, having a bowl for dry ingredients (task branch) and a bowl for wet ingredients, (master branch) making them separately and then just dumping the dry bowl into the wet bowl (merge).
Rebase is taking a time machine back to before you started mixing the dry ingredients, mix all the wet ingredients first then add the dry ones on top of that in the same bowl.
It’s really hard to create an analogy for this.
Merge is taking all the code from the master branch and combining it with the task branch, resulting in a commit for just the merge itself.
Rebase is “re-basing” where your task branch was created from off the master branch. It essentially takes all the commits from master that happened since you branched, REWRITES THE HISTORY of your task branch by inserting those master branch commits before all your existing commits, and effectively makes your task branch look like it was branched yesterday instead of like 4 weeks ago. You changed where your task branch originated on the master. You moved its base.
Atlassian does a fantastic writeup on this.
BlackPenguins@lemmy.worldto Technology@lemmy.world•New Discord TOS binds you to forced arbitration - Opt-Out NowEnglish9·1 year agoSomething from Legal Eagle would be nice too.
BlackPenguins@lemmy.worldto Technology@lemmy.world•‘IRL Fakes:’ Where People Pay for AI-Generated Porn of Normal PeopleEnglish3·1 year agoIt depends on the models you use too. There’s specific training models data out there and all you need to do is give it a prompt of “naked” or something and it’s scary good at making something realistic in 2 minutes. But yeah, there is a learning curve at setting everything up.
Cue the Republicans trying to ban HTML from our Internet to protect the kids. Yeah, you do that…
BlackPenguins@lemmy.worldto Technology@lemmy.world•European crash tester says carmakers must bring back physical controlsEnglish71·1 year agoTime and place. Do I want everything on a touchscreen at home? More compact and allows more options. Yes.
While I’m trying to fumble for a control when I’m driving a 2000 lb deathtrap at 55 MPH? No.
BlackPenguins@lemmy.worldto Technology@lemmy.world•Roku TV bricked until agreeing to new terms of serviceEnglish1·1 year ago“We can’t solve your case until we solve all the murders first. All of them.”
Crime is crime dude.
BlackPenguins@lemmy.worldto Technology@lemmy.world•Roku TV bricked until agreeing to new terms of serviceEnglish3·1 year agoIs this what Tucker Carlson meant by I’m radicalized? Us damn rich Americans and our smart TVs.
BlackPenguins@lemmy.worldto Technology@lemmy.world•Roku TV bricked until agreeing to new terms of serviceEnglish1·1 year agoBOOOOORRTLES
BlackPenguins@lemmy.worldto Technology@lemmy.world•Bumble cuts ~350 employees as dating apps face a reckoningEnglish25·1 year agoI paid for a month of Bumble and that’s how I realized it’s a scam. I get monetizing your business. But they wanted me to pay them to extend a window of how long a girl has a chance to respond after I like them. You only get 24 hours.
I’m smart enough to know women have lives. And what if my “soulmate” didn’t see my like because she didn’t log in to the app for a few days? The app shouldn’t shake me down for more cash just to keep my visibility. You can monetize features, and perks, and number of swipes. But don’t monetize the ability for people to meet. In my opinion OkCupid is still the best one around.
BlackPenguins@lemmy.worldto Climate - truthful information about climate, related activism and politics.@slrpnk.net•Joe Biden just did the rarest thing in US politics: he stood up to the oil industry; The Biden administration suspended new permits for natural gas terminals. Can we see more of this kind of backbone?2·1 year agoJoe Bi the Science Guy
BlackPenguins@lemmy.worldto Technology@lemmy.world•It's Time to Ditch Evernote for One of These AlternativesEnglish2·1 year agoThe app literally freezes for me now there is so much crap in it.
BlackPenguins@lemmy.worldto Technology@lemmy.world•It's Time to Ditch Evernote for One of These AlternativesEnglish8·1 year agoThey also started annoying the users on every load with “deals” to buy their paid version. And they do that shitty thing where they switch the intuitive nature of the yes and no buttons.
BlackPenguins@lemmy.worldto Technology@lemmy.world•Reddit now blocks signed out VPN connections.English5·1 year agoI still use Reddit for this same reason. It’s the lack of communities. Every TV and every movie having a thread available. I’d love if lemmy started doing live discussions.
BlackPenguins@lemmy.worldto Technology@lemmy.world•Reddit now blocks signed out VPN connections.English14·1 year agoCan’t you just spoof a user agent anyway?
BlackPenguins@lemmy.worldto Technology@lemmy.world•Walmart, Costco and other companies rethink self-checkout, some stores removing themEnglish6·1 year agoWegmans tried that at first but failed and removed it. No one wants to scan products with their phone while shopping.
BlackPenguins@lemmy.worldto Technology@lemmy.world•Microsoft won’t let you close OneDrive on Windows until you explain yourselfEnglish2·1 year agoSomeone clearly didn’t get your sarcasm.
BlackPenguins@lemmy.worldto Technology@lemmy.world•YouTube's plan backfires, people are installing better ad blockersEnglish2·1 year agoNot sure why people are downvoting you, fuck them. I love several of those channels. Especially “in a nutshell”.
Voters: “Bad police get punished.”
Yost: “I don’t understand. Is this English? What are these words!”