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)

gold brick: Jun 19, 2001; no he isn't

Uziel posted:

OK, so I have a trunk version and a branch called 1.0.0. I'm using AnkhSVN's plugin for Visual Studio 2008, and VisualSVN server.

I made some changes to 4 style sheets in the trunk version that I want to push to the branch.

I looked at the merge wizard but I don't understand at all. I just want to overwrite the stylesheets in the branch with those in the trunk.

It might help to think of it the other way around. "I want to pull revision {x} from the trunk into my branch". Open up a working copy of the branch and try running the merge wizard from there. You want to merge a range of revisions. If you branched correctly, the merge wizard should autodetect that branch 1.0.0 came from trunk and prepopulate the "Merge from" dialog with something sensible.

# ¿ Nov 18, 2009 17:36

Adbot: ADBOT LOVES YOU

# ¿ May 3, 2024 09:25

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