[Butia-devel-list] Jugando con remotos

[Alan Jhonn Aguiar Schwyn]

tenés cambios locales además del followme?
si está todo commiteado, hacé un:
 git reset --hard

eso debería descartar los cambios y dejarte ir a master..

> From: xxopxe en gmail.com
> To: alanjas en hotmail.com
> Date: Mon, 27 Feb 2012 12:25:22 -0200
> CC: butia-devel-l en fing.edu.uy; greisch en fing.edu.uy; butia en fing.edu.uy
> Subject: Re: [Butia-devel-list] Jugando con remotos
> 
> On lun, 2012-02-27 at 13:56 +0000, Alan Jhonn Aguiar Schwyn wrote:
> > 
> > Y si hacés algo asi?
> > 
> > 
> > git checkout master
> > git pull
> > git checkout toribio
> > git merge toribio master
> 
> Ni siquiera pueo salirme del branch toribio... Como el merge falló me
> dice
> 
> jvisca en fofotimol:~/workspace/butia$ git checkout master
> turtle_art_plugin/followme/NEWS: needs merge
> turtle_art_plugin/followme/__init__.py: needs merge
> turtle_art_plugin/followme/followme.py: needs merge
> turtle_art_plugin/followme/icons/FollowMeoff.svg: needs merge
> turtle_art_plugin/followme/icons/FollowMeon.svg: needs merge
> turtle_art_plugin/followme/lib/pygame/__init__.py: needs merge
> turtle_art_plugin/followme/lib/pygame/_arraysurfarray.so: needs merge
> turtle_art_plugin/followme/lib/pygame/_camera.so: needs merge
> turtle_art_plugin/followme/lib/pygame/_camera_opencv_highgui.py: needs
> merge
> turtle_art_plugin/followme/lib/pygame/_camera_vidcapture.py: needs merge
> turtle_art_plugin/followme/lib/pygame/_numericsndarray.so: needs merge
> turtle_art_plugin/followme/lib/pygame/_numericsurfarray.so: needs merge
> turtle_art_plugin/followme/lib/pygame/_numpysndarray.py: needs merge
> turtle_art_plugin/followme/lib/pygame/_numpysurfarray.py: needs merge
> turtle_art_plugin/followme/lib/pygame/base.so: needs merge
> turtle_art_plugin/followme/lib/pygame/bufferproxy.so: needs merge
> turtle_art_plugin/followme/lib/pygame/camera.py: needs merge
> turtle_art_plugin/followme/lib/pygame/cdrom.so: needs merge
> turtle_art_plugin/followme/lib/pygame/color.so: needs merge
> turtle_art_plugin/followme/lib/pygame/colordict.py: needs merge
> turtle_art_plugin/followme/lib/pygame/compat.py: needs merge
> turtle_art_plugin/followme/lib/pygame/constants.so: needs merge
> turtle_art_plugin/followme/lib/pygame/cursors.py: needs merge
> turtle_art_plugin/followme/lib/pygame/display.so: needs merge
> turtle_art_plugin/followme/lib/pygame/draw.so: needs merge
> turtle_art_plugin/followme/lib/pygame/event.so: needs merge
> turtle_art_plugin/followme/lib/pygame/fastevent.so: needs merge
> turtle_art_plugin/followme/lib/pygame/font.so: needs merge
> turtle_art_plugin/followme/lib/pygame/freesansbold.ttf: needs merge
> turtle_art_plugin/followme/lib/pygame/gfxdraw.so: needs merge
> turtle_art_plugin/followme/lib/pygame/gp2x/__init__.py: needs merge
> turtle_art_plugin/followme/lib/pygame/gp2x/constants.py: needs merge
> turtle_art_plugin/followme/lib/pygame/gp2x/locals.py: needs merge
> turtle_art_plugin/followme/lib/pygame/image.so: needs merge
> turtle_art_plugin/followme/lib/pygame/imageext.so: needs merge
> turtle_art_plugin/followme/lib/pygame/install.html: needs merge
> turtle_art_plugin/followme/lib/pygame/joystick.so: needs merge
> turtle_art_plugin/followme/lib/pygame/key.so: needs merge
> turtle_art_plugin/followme/lib/pygame/lgpl: needs merge
> turtle_art_plugin/followme/lib/pygame/locals.py: needs merge
> turtle_art_plugin/followme/lib/pygame/mac_scrap.py: needs merge
> turtle_art_plugin/followme/lib/pygame/macosx.py: needs merge
> turtle_art_plugin/followme/lib/pygame/mask.so: needs merge
> turtle_art_plugin/followme/lib/pygame/midi.py: needs merge
> turtle_art_plugin/followme/lib/pygame/mixer.so: needs merge
> turtle_art_plugin/followme/lib/pygame/mixer_music.so: needs merge
> turtle_art_plugin/followme/lib/pygame/mouse.so: needs merge
> turtle_art_plugin/followme/lib/pygame/movie.so: needs merge
> turtle_art_plugin/followme/lib/pygame/overlay.so: needs merge
> turtle_art_plugin/followme/lib/pygame/pixelarray.so: needs merge
> turtle_art_plugin/followme/lib/pygame/pkgdata.py: needs merge
> turtle_art_plugin/followme/lib/pygame/pygame.ico: needs merge
> turtle_art_plugin/followme/lib/pygame/pygame_icon.bmp: needs merge
> turtle_art_plugin/followme/lib/pygame/pygame_icon.icns: needs merge
> turtle_art_plugin/followme/lib/pygame/pygame_icon.svg: needs merge
> turtle_art_plugin/followme/lib/pygame/pygame_icon.tiff: needs merge
> turtle_art_plugin/followme/lib/pygame/pypm.so: needs merge
> turtle_art_plugin/followme/lib/pygame/readme.html: needs merge
> turtle_art_plugin/followme/lib/pygame/rect.so: needs merge
> turtle_art_plugin/followme/lib/pygame/rwobject.so: needs merge
> turtle_art_plugin/followme/lib/pygame/scrap.so: needs merge
> turtle_art_plugin/followme/lib/pygame/sndarray.py: needs merge
> turtle_art_plugin/followme/lib/pygame/sprite.py: needs merge
> turtle_art_plugin/followme/lib/pygame/surface.so: needs merge
> turtle_art_plugin/followme/lib/pygame/surfarray.py: needs merge
> turtle_art_plugin/followme/lib/pygame/surflock.so: needs merge
> turtle_art_plugin/followme/lib/pygame/sysfont.py: needs merge
> turtle_art_plugin/followme/lib/pygame/threads/Py25Queue.py: needs merge
> turtle_art_plugin/followme/lib/pygame/threads/__init__.py: needs merge
> turtle_art_plugin/followme/lib/pygame/time.so: needs merge
> turtle_art_plugin/followme/lib/pygame/transform.so: needs merge
> turtle_art_plugin/followme/lib/pygame/version.py: needs merge
> turtle_art_plugin/followme/po/es.po: needs merge
> error: you need to resolve your current index first
> jvisca en fofotimol:~/workspace/butia$ 
> 
> 
> _______________________________________________
> Butia-devel-l site list
> Butia-devel-l en fing.edu.uy
> https://www.fing.edu.uy/mailman/listinfo/butia-devel-l
 		 	   		  
------------ próxima parte ------------
Se ha borrado un adjunto en formato HTML...
URL: https://www.fing.edu.uy/mailman/private/butia-devel-l/attachments/20120227/56988d32/attachment.html"