LightNews — News, ranked by scholars

Julia Evans

@b0rk.jvns.ca

fixing diverged git branches
wizardzines.com/comics/fixin...

this one has a lot of diagrams

panel 1: ways to reconcile two diverged branches

- combine the changes from both with rebase or merge!
- throw out your local changes after breaking your local branch!
- throw out the remote changes to get rid of something you accidentally pushed (be REAL careful with this one)

panel 2: rebase

git pull --rebase
git push

person: this one's my favourite!

panel 3: merge

git pull --no-rebase
git push

panel 4: throw away local changes

git switch -c newbranch
git switch main
git reset --hard origin/main

panel 5: throw away remote changes (DANGER!)

git push --force

(--force-with-lease is a little safer)

panel 6: reasons to throw away changes

- I'll throw away local changes if I accidentally committed to main instead of a new branch

- I'll throw away remote changes if I want to amend a commit after pushing it, and I'm the only one working on that branch

March 5, 2024 at 4:02 PM

Olivier

@niluaro.bsky.social

Normalemment t'auras besoin de ça : git clone; git checkout -b <newbranch> ; [...] ; git add <fichiers> ; git commit -m <message> ; git push --set-upstream origin <newbranch> ; puis faire une Pull Request en clic-clic :)

October 22, 2025 at 9:06 PM

QATCTech

@qatctech.com

Exciting news! Our Harare branch is now open! More convenience, more service, and the same commitment to excellence. Come celebrate with us! #NewBranch #HarareOffice

May 28, 2025 at 7:00 AM

mechanicalbusiness.bsky.social

@mechanicalbusiness.bsky.social

On April 28, 2025, Refrigerative Supply Limited will open the doors to its new branch at Unit 1 – 905 Park Street, Regina, SK.
.
.
.
Click on the link for more details: mechanicalbusiness.com/2025/04/17/r...
#RSL #HVACR #Saskatchewan #newbranch

April 25, 2025 at 12:03 PM

Techup Pakistan

@technovahubs.bsky.social

Follow Technova

☕✨ Costa Coffee Arrives at E-Street, Clifton!

Costa Coffee has officially opened its newest branch at E-Street, Clifton, bringing its signature coffee experience to one of Karachi’s favorite hangout destinations.

#CostaCoffee #EStreet #CliftonKarachi #NewBranch #CoffeeCulture

May 26, 2026 at 3:28 AM

Ken Larson

@rosecoveredglasses.bsky.social

ARMY LAUNCHES NEW BRANCH for Military Space Operations, formalizing space as a permanent war fighting specialty.
rosecoveredglasses.wordpress.com/2026/07/13/a...
#USArmy #NewBranch #SpaceOperations

July 13, 2026 at 10:35 AM

mechanicalbusiness.bsky.social

@mechanicalbusiness.bsky.social

NEXT Plumbing and Hydronics Supply has opened a new branch at 835 Intermodal Drive in Bramalea, a suburb of Brampton, ON.
.
.
.
Click on the link for more details: buff.ly/e5ZEz0Z
#NEXTSupply #newbranch #Ontario #hydronics #plumbing

January 7, 2026 at 1:00 PM

Artix Linux Forum - Index [Unofficial]

@forum.artixlinux.org.web.brid.gy

Re: Open for Testing - User Repository for Init Scripts

Cool idea - I created this Python wrapper to download (via trizen) Nym-VPN and setup the OpenRC Daemon for it. https://github.com/MordechaiShebuel/scripts/blob/NewBranch/install_nym.py

forum.artixlinux.org

April 26, 2026 at 3:03 PM

Artix Linux Forum - Index [Unofficial]

@forum.artixlinux.org.web.brid.gy

Re: Script to Install Nym-VPN

Updated the script - includes function to not repeat the work if it's already been done and the service is already running. https://github.com/MordechaiShebuel/scripts/blob/NewBranch/install_nym.py

forum.artixlinux.org

April 25, 2026 at 2:59 PM

Artix Linux Forum - Index [Unofficial]

@forum.artixlinux.org.web.brid.gy

Script to Install Nym-VPN

Created this script that installs Nym (From AUR using Trizen) and then creates the proper OpenRC daemon so it will work every boot. https://github.com/MordechaiShebuel/scripts/blob/NewBranch/install_nym.py

forum.artixlinux.org

April 11, 2026 at 3:56 PM

Artix Linux Forum - Index [Unofficial]

@forum.artixlinux.org.web.brid.gy

Script to Install Nym-VPN

Created this script that installs Nym (From AUR using Trizen) and then creates the proper OpenRC daemon so it will work every boot. https://github.com/MordechaiShebuel/scripts/blob/NewBranch/install_nym.py

forum.artixlinux.org

April 11, 2026 at 1:56 PM

Blaze Trends

@blazetrends.bsky.social

Nintendo Establishes Singapore Office, Eyes Thailand Expansion

#businessexpansion #NewBranch #Nintendo #singapore #Thailand

Nintendo Establishes Singapore Office, Eyes Thailand Expansion

Gamers across Southeast Asia just got some exciting news. Nintendo, the famous game company, officially announced today it has opened a new office in

blazetrends.com

September 30, 2025 at 5:31 AM

Tri Counties Bank

@tricountiesbank.bsky.social

We’re thrilled to announce that our new Tri Counties Bank branch in West Portal is now open! Stop by to meet our friendly team and discover personalized banking services made just for you. Visit us today at 279 W. Portal Avenue in San Francisco. brnw.ch/21wVC1T. #NewBranch #WestPortal #MemberFDIC

September 9, 2025 at 9:32 PM

Tri Counties Bank

@tricountiesbank.bsky.social

The final touches are underway at our new West Portal branch and we can’t wait to open! Our experienced team is ready to bring personalized service and community banking to the neighborhood. Learn more: brnw.ch/21wUqxt. #NewBranch #WestPortal #ComingSoon #SanFrancisco #MemberFDIC

July 25, 2025 at 3:08 PM

Tri Counties Bank

@tricountiesbank.bsky.social

Tri Counties Bank is coming soon to West Portal in San Francisco! We look forward to serving the people and businesses that make this community special. Learn more: brnw.ch/21wTZbQ. #NewBranch #OpeningSoon #WestPortal #MemberFDIC