links for 2009-05-08

  • # Pull the update from master, or whereever – git pull
    # See the dreaded merge failed message
    # Edit the files which failed to merge correctly cleaning up the code
    # Run your tests / specs just to make sure you caught everything
    # Add and commit the manually merged file. git add path/to/file.rb; git commit -m “work damnit”
    # Go back to pushing and pulling in peace
    (tags: git merge tips)
Advertisements

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s

%d bloggers like this: