The Artima Developer Community
Articles | News | Weblogs | Books | Forums
Artima Forums | Articles | Weblogs | Java Answers | News
Sponsored Link •

Ruby Buzz Forum
Git annoyance

0 replies on 1 page.

Welcome Guest
  Sign In

Go back to the topic listing  Back to Topic List Click to reply to this topic  Reply to this Topic Click to search messages in this forum  Search Forum Click for a threaded view of the topic  Threaded View   
Previous Topic   Next Topic
Flat View: This topic has 0 replies on 1 page
Daniel Berger

Posts: 1383
Nickname: djberg96
Registered: Sep, 2004

Daniel Berger is a Ruby Programmer who also dabbles in C and Perl
Git annoyance Posted: Dec 16, 2009 8:48 AM
Reply to this message Reply

This post originated from an RSS feed registered with Ruby Buzz by Daniel Berger.
Original Post: Git annoyance
Feed Title: Testing 1,2,3...
Feed URL: http://djberg96.livejournal.com/data/rss
Feed Description: A blog on Ruby and other stuff. 		Latest Ruby Buzz Posts
Latest Ruby Buzz Posts by Daniel Berger
Latest Posts From Testing 1,2,3...

Advertisement 
>git pull
remote: Counting objects: 40, done.
remote: Compressing objects: 100% (24/24), done.
remote: Total 24 (delta 15), reused 0 (delta 0)
Unpacking objects: 100% (24/24), done.
From github.com:foo/bar
   fc4c25b..7bf7d5a  master     -> origin/master
Updating fc4c25b..7bf7d5a
error: Entry 'app/controllers/application_controller.rb' not uptodate. Cannot merge.

I would very much like the "just blow it away and replace it with the latest" option. Is there an easy way to do this that I don't know about, short of writing an alias?

Read: Git annoyance

Topic: Semantic Versioning Previous Topic   Next Topic Topic: 10 developer skills needed in 2010
Sponsored Links


Google
  Web Artima.com   

Copyright © 1996-2019 Artima, Inc. All Rights Reserved. - Privacy Policy - Terms of Use