Skip to content

Primary Menu

  • Portfolio
  • Services
    • Web Design
    • Digital Marketing
    • Web Hosting & Support
  • Blog
  • About
  • Contact
  • Bryan Hoffman @spigot
  • tweets5422
  • following291
  • followers390
  • listed13
  • Follow @spigot
@spigot profile

  • Bryan Hoffman

  • @spigot
  • spigotdesign
  • Park City, Utah
  • http://spigotdesign.com/

Since I’m currently dealing with it myself, here’s how to deal with merge conflicts in Git: css-tricks.com/deal-merge-con…

From Tweetbot for Mac 3:20pm Apr 22 2014 —

Leave a Reply Cancel reply

Your email address will not be published. Required fields are marked *

This site uses Akismet to reduce spam. Learn how your comment data is processed.

Archives

202078 tweets
  1. J
  2. F
  3. M
  4. A
  5. M
  6. J
  7. J
2019153 tweets
  1. J
  2. F
  3. M
  4. A
  5. M
  6. J
  7. J
  8. A
  9. S
  10. O
  11. N
  12. D
2018214 tweets
  1. J
  2. F
  3. M
  4. A
  5. M
  6. J
  7. J
  8. A
  9. S
  10. O
  11. N
  12. D
2017352 tweets
  1. J
  2. F
  3. M
  4. A
  5. M
  6. J
  7. J
  8. A
  9. S
  10. O
  11. N
  12. D
2016346 tweets
  1. J
  2. F
  3. M
  4. A
  5. M
  6. J
  7. J
  8. A
  9. S
  10. O
  11. N
  12. D
2015345 tweets
  1. J
  2. F
  3. M
  4. A
  5. M
  6. J
  7. J
  8. A
  9. S
  10. O
  11. N
  12. D
2014722 tweets
  1. J
  2. F
  3. M
  4. A
  5. M
  6. J
  7. J
  8. A
  9. S
  10. O
  11. N
  12. D
2013504 tweets
  1. J
  2. F
  3. M
  4. A
  5. M
  6. J
  7. J
  8. A
  9. S
  10. O
  11. N
  12. D
2012637 tweets
  1. J
  2. F
  3. M
  4. A
  5. M
  6. J
  7. J
  8. A
  9. S
  10. O
  11. N
  12. D
2011716 tweets
  1. J
  2. F
  3. M
  4. A
  5. M
  6. J
  7. J
  8. A
  9. S
  10. O
  11. N
  12. D
2010340 tweets
  1. J
  2. F
  3. M
  4. A
  5. M
  6. J
  7. J
  8. A
  9. S
  10. O
  11. N
  12. D
2009831 tweets
  1. J
  2. F
  3. M
  4. A
  5. M
  6. J
  7. J
  8. A
  9. S
  10. O
  11. N
  12. D
2008232 tweets
  3. M
  4. A
  5. M
  6. J
  7. J
  8. A
  9. S
  10. O
  11. N
  12. D

Stats

  • Tweets 5422
  • Followers 390
  • Following 291
  • Listed 13
  • Link ratio 29.1%
  • Reply ratio 29.9%
  • Tweeting since March 16, 2008

#hashtags

  • ASG
  • askatp
  • Basecamp
  • billinlikeavillian
  • blackhawks
  • camstraps
  • canyoneering
  • cerebralPalsy
  • Coda
  • css
  • ecommerce
  • eig
  • electricskateboard
  • ExpressionEngine
  • Firefox
  • FYI
  • grandpagotobed
  • hyside
  • indieweb
  • induction
  • kidsincanyons
  • livepcgivepc
  • lunareclipse
  • lyt
  • MayThe4thBeWithYou
  • MediaTemple
  • MinnesotaTwins
  • MNTwins
  • mnwild
  • NetNeutrality
  • northwash
  • nrs
  • OpeningDay
  • parkcity
  • rafting
  • responsive
  • StateOfHockey
  • Tigers
  • Twins
  • utah
  • Vikings
  • webdesign
  • Webkit
  • WhiteSox
  • WordPress

Next update in 15h 34m 12s

Work with Us

© Spigot Design. Some rights reserved. Privacy