[errai-dev] Hiccup on 3.0 branch

[Jonathan Fuerth]

**ALERT - NON-FASTFORWARD UPDATE ON 3.0 BRANCH **

I've just done another fixup-and-force-push.

Everybody working on 3.0, please do a:

% git fetch --all
% git reset --hard upstream/3.0

before pushing or merging any work.

As before, if you have any questions about loss or potential loss of work on 3.0, please ask in #errai on freenode IRC.

Thanks for bearing with us! :-)

-Jonathan

On 2013-01-18, at 3:06 PM, Jonathan Fuerth wrote:

> Hi Errai devs,
> 
> We had a slight hiccup today on the 3.0 branch, and we decided to rewind it by several commits in the upstream repo. If you pulled in the 3.0 branch any time in the past 5-6 hours, please be sure you re-fetch and rebase your work on the new 3.0 branch pointer in upstream.
> 
> One possible approach:
> 
> % git fetch --all
> % git reset --hard upstream/3.0
> (and then cherry-pick any commits you had that were abandoned.)
> 
> Another possible approach would be to rebase -i and drop the accidental commits.
> 
> Drop by #errai on freenode if you're in doubt. :)
> 
> -Jonathan
> _______________________________________________
> errai-dev mailing list
> errai-dev at lists.jboss.org
> https://lists.jboss.org/mailman/listinfo/errai-dev