Speed Up Merges with Git's Index
We've all been there, running git merge only to have it spew CONFLICT all over the place and quit partway through. But if we already know that every time there is a conflict then all of "our" code that we are merging changes into should take precedence over "their" changes that we are pulling in, git 1.7.3 provides a handy shortcut for that:
Some more good Git Goodness!
Categories: Infrastructure, Interests, System Adminstration
Comments (0)
Trackbacks (0)
Leave a comment
Trackback
Leave a Reply
Folks...
All Things Distributed – Werner Vogels
- DynamoDB Keeps Getting Better (and cheaper!)
- Back-to-Basics Weekend Reading - Using continuations to implement thread management and communication in operating systems
- Expanding the Cloud: Faster, More Flexible Queries with DynamoDB
- Back-to-Basics Weekend Reading - Join Processing in Relational Databases
PuppetLabs Blog
- Puppet Camp SFO Covers Cloud Automation, Scaling Puppet, and Pushups
- Manage and Automate VMware Virtual Environments With Puppet Enterprise
- Belgium Advanced Puppet Training: Sponsored by Open-Future
- Drop the Spreadsheet, Use Puppet Enterprise as Your Single Source of Truth
- From Puppet User Group to PuppetConf: It’s All About the Culture
Dev2ops
- Will Sterling presentation on Rundeck at the April CLUE Meeting (Video)
- Why we end up with complex tools
- The key to simplicity isn’t “Know How” it’s “Know Why”
- IT stability and business innovation are not enemies
- Rerun: Making shell scripts even more useful (and a bit cool, again)
- Automating the full management lifecycle of Jenkins using Rerun
- Improving Flow: Fix the Handoffs to Remove Your Worst Bottlenecks
High Scalability
- Stuff The Internet Says On Scalability For May 17, 2013
- Paper: Warp: Multi-Key Transactions for Key-Value Stores
- Lesson from Airbnb: Give Yourself Permission to Experiment with Non-scalable Changes
- Sponsored Post: Dow Jones, Spotify, Evernote, Surge, Rackspace, Amazon, Booking, aiCache, Aerospike, Percona, ScaleOut, New Relic, LogicMonitor, AppDynamics, ManageEngine, Site24x7
- The Secret to 10 Million Concurrent Connections -The Kernel is the Problem, Not the Solution
Wired.com – Cloudline
- Contributor Content | Get a Jump on the Next 20 Years of Technology
- Reports of Social TV’s Death Have Been Greatly Exaggerated
- Contributor Content | Last Mile: Elastic Integration Will Deliver the Boundless Business
- Contributor Content | The CIO Mobility Challenge: From Coping to Mastering
- Contributor Content | Why Don’t We Learn from Mistakes in IT?
Wired.com – Playbook
- Contributor Content | Get a Jump on the Next 20 Years of Technology
- Reports of Social TV’s Death Have Been Greatly Exaggerated
- Contributor Content | Last Mile: Elastic Integration Will Deliver the Boundless Business
- Contributor Content | The CIO Mobility Challenge: From Coping to Mastering
- Contributor Content | Why Don’t We Learn from Mistakes in IT?
Wired.com – Business
- Big Tech | Hangouts Feature Emerges as a Big Bright Spot for Google+
- Big Tech | With I/O Speech, Larry Page Reminds Us Why Google Rules Tech
- New Cash Registers Are Sexy, But What’s Beneath the Counter Matters More
- Startups | These Aren’t Your Little Brother’s Drones — Or Big Brother’s Either
- Mobile | Why Google’s Big Conference Will Be Quieter This Year
Wired.com – Enterprise
- Microchips | Google, NASA Open New Lab to Kick Tires on Quantum Computer
- Software | Holy Octocat! There’s Church Music on GitHub Now
- Cloud | Google Pries Another Nail From PHP’s Coffin
- Networks | Is It Wrong to Use Data From the World’s First ‘Nice’ Botnet?
- Cloud | Unhappy Customers Want to Parachute From Adobe’s Creative Cloud
