[git-users] Fixing a shared repository (bad merge pushed and pulled to other local repos)

2012-11-21 Thread Brian Kotek
I've been using Git for a while and I'm fairly well-versed with it. However, an issue came up at work yesterday that was a bear to resolve. I'd like to know if anyone has any advice or if there's a preferred way to deal with this. One of the developers (new to Git) did something bizarre like

Re: [git-users] Fixing a shared repository (bad merge pushed and pulled to other local repos)

2012-11-21 Thread Inigo Medina
On Wed, 21 Nov 2012, Brian Kotek wrote: One of the developers (new to Git) did something bizarre like merge an old branch into a new one and then push it. As a result, a lot of files were deleted or changed (back to older versions). No one initially noticed (we have a CI server but it only