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)

skidooer: Aug 6, 2001

I cannot for the life of me figure out this one:

code:

local$ git status
# On branch master
nothing to commit (working directory clean)
local$ git push
Everything up-to-date

remote$ git status
# On branch master
nothing to commit (working directory clean)
remote $ git pull
Already up-to-date.

Looks good to me, except several changes made on "local" are not being merged on "remote," despite both systems claiming they are up-to-date. Both "local" and "remote" are pushing/pulling from the same resource (located on a third machine). Is there some crazy git command to force the update, or otherwise fix this problem?

# ¿ Nov 14, 2009 22:57

Adbot: ADBOT LOVES YOU

# ¿ May 3, 2024 14:27

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