It was me. My bad guys. Should have just done the merge commit instead. On Aug 19, 2013 1:01 PM, "Andrew Grieve" <[email protected]> wrote:
> cordova-plugin-dialogs, cordova-plugin-device-orientation, (maybe more, but > at this point I deleted them all and re-cloned) > > > On Mon, Aug 19, 2013 at 3:53 PM, Jesse <[email protected]> wrote: > > > If it is in windows8 it was probably me, but I never push -f > > Which repos are you seeing this on? > > > > @purplecabbage > > risingj.com > > > > > > On Mon, Aug 19, 2013 at 11:26 AM, Andrew Grieve <[email protected] > > >wrote: > > > > > I'm seeing that on multiple of my plugin repos, I get: > > > > > > git fetch && git status > > > > > > # On branch dev > > > # Your branch and 'origin/dev' have diverged, > > > # and have 2 and 9 different commits each, respectively. > > > # > > > # Untracked files: > > > # (use "git add <file>..." to include in what will be committed) > > > # > > > # src/windows8/ > > > nothing added to commit but untracked files present (use "git add" to > > > track) > > > > > > Looking at the history, it looks like someone has rebased (or similar) > > and > > > git push -f'ed on these repos. > > > > > > If you run into this, fix it via: > > > git checkout dev && git reset origin/dev --hard > > > > > > If it was you that push -f'ed... for shame!! > > > > > >
