Re: Wonder 6.1

Hi Ramsey,

Am 27.04.2013 um 23:57 schrieb Ramsey Gurley <[email protected]>:

> I don't know if this breaks anything, but I've managed to whack the github repo trying to merge after the accidental master merge this week.  
> 
> Merging master with the the changes on integration up to 2fcdd8135dfa9497968a2c0801c8379161e1a67e resulted in omission of commits I had made 3 weeks ago on integration. 
> 
> Since we just want the changes in integration up to that point, I did a hard reset on master back to 2fcdd8135dfa9497968a2c0801c8379161e1a67e and made that the head of master branch and tagged it wonder-6.1

This is something I didn't have to deal with often in git. I can reset my own local copy and then pull the new master in, but I can't push that back to other repos:

error: failed to push some refs to 'https://github.com/maiksd/wonder.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
hint: before pushing again.

How am I supposed to proceed?

Maik
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service 
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_apr