Oh shit, git: Getting myself out of bad situations
I&#x27;ve said this before, but the business leadership, and tech leadership, need to think carefully about whether or not they need all of the power of Git. This sums up my concerns:<p>-----------------------<p><i>Here are some minor failure modes I’ve seen with Git:<p>1. a branch that stays open for many months, perhaps even a year (for instance, at Maternity Neighborhood)<p>2. data is erased for good because someone makes a mistake while using rebase<p>3. a developer introduces a new bug while trying to resolve a merge conflict<p>4. widespread but fine-grained cherry picking leaves the team unclear about what’s been merged and what has not been merged<p>5. a developer makes a change in the wrong branch because they forgot what branch they were in<p>6. a developer is unable to recover a stash because they forgot where they were when they created the stash, or they simply forget that they have work in a stash<p>7. developers confused by working in an unattached commit, after a botched attempt to revert<p>8. a developer feels the need to delete the repo from their harddrive and clone it again, because the whole repo got into a state that they seemed unable to resolve<p>9. the “blame” command is nearly useless — maybe its because we never know in which branch a given change was made, finding who made a mistake is very difficult<p>10. developers get confused about which branch will be deployed (I see this especially in shops that have lots of repos for lots of small apps, and use different Git workflow strategies for the different repos, often because different programmers or different teams control the different repos)<p>11. developers push their changes to “origin” but forget to push to “upstream” or vice versa.<p>But all of that stuff is trivial compared to the major flaw:<p>Graphic designers, writers, HTML&#x2F;CSS frontenders, managers, data analysts and QA staff can’t use Git, even though they all used Subversion.</i><p><a href="http:&#x2F;&#x2F;www.smashcompany.com&#x2F;business&#x2F;business-productivity-has-been-undermined-by-the-hubris-and-power-grabbing-of-elite-computer-programmers" rel="nofollow">http:&#x2F;&#x2F;www.smashcompany.com&#x2F;business&#x2F;business-productivity-h...</a>