Re: Wonder 6.1

Am 29.04.2013 um 18:42 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
> 
> This is easy in eGit. Go into the "Git Repository Exploring" perspective of Eclipse. In the repositories view select wonder->remotes->myremote. You'll see a fetch config (green) and a push config(red). Right click on your push and "Configure Push...". When the dialog opens, click the [Advanced...] button. In the "Specifications for push" table, you will see a column "Force Update". Check that box for master and the next time you push, your local master will become the remote master.
> 
> By default, the remote wins. This changes it so that your local wins. As such, take care not to wipe out anything on the fork's master you actually want. Let's say someone pushes a commit just before you do, their commit is just gone after you do a force update. 
> 
> When you finish, be sure to go back and uncheck the Force Update box.

All right, understood that I need to force-push. I don't use eGit, but Sourcetree. Sourcetree doesn't have this switch as I see it, but it was fairly easy via command line:

git push --force remotename master

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