Version Control Questions Megathread (SVN / git / whatever else)

Register a SA Forums Account here!
JOINING THE SA FORUMS WILL REMOVE THIS BIG AD, THE ANNOYING UNDERLINED ADS, AND STUPID INTERSTITIAL ADS!!!

You can: log in, read the tech support FAQ, or request your lost password. This dumb message (and those ads) will appear on every screen until you register! Get rid of this crap by registering your own SA Forums Account and joining roughly 150,000 Goons, for the one-time price of $9.95! We charge money because it costs us money per month for bills, and since we don't believe in showing ads to our users, we try to make the money back through forum registrations.

The Something Awful Forums > Discussion > Serious Hardware/Software Crap > The Cavern of COBOL > Version Control Questions Megathread (SVN / git / whatever else)

bobmarleysghost: Mar 7, 2006

I have a rookie question, what's the best way to get any changes from the main branch into my dev branch?

Basically I want to go from here:

code:


A --- B --- C (main)
\
 D -- E (mydev)

To here:

code:


A --- B --- C (main)
             \
              D -- E (mydev)

# ¿ Oct 5, 2023 15:18

Adbot: ADBOT LOVES YOU

# ¿ May 13, 2024 22:57

bobmarleysghost: Mar 7, 2006

So going the rebase route, it won't merge any of my changes into the main branch? (I don't want my changes merged, yet)

# ¿ Oct 5, 2023 15:30

bobmarleysghost: Mar 7, 2006

nvm, thanks for the help!

bobmarleysghost fucked around with this message at 18:57 on Oct 5, 2023

# ¿ Oct 5, 2023 16:18

The Something Awful Forums > Discussion > Serious Hardware/Software Crap > The Cavern of COBOL > Version Control Questions Megathread (SVN / git / whatever else)