[Libre-soc-dev] git forced master reversion on wiki and soc

[Alain Williams]

On Thu, Mar 18, 2021 at 09:07:43AM -0700, Jacob Lifshay wrote:
> On Thu, Mar 18, 2021, 01:29 Luke Kenneth Casson Leighton <lkcl at lkcl.net>
> wrote:
> 
> > i've made both soc and the wiki temporarily read-only until i hear
> > from everybody that they've not done an overnight "git pull" and/or
> > that they have restored master branch to the following (or later)
> >
> > soc b467827f51016fa5c8c96faa25b4e0790197a9f7
> > wiki 9784ecefb8a9b0e8e7aeae4c92fc1a622ac45325
> >
> > the reason for making them read-only is to ensure that people do not
> > push against the wrong master branch.
> >
> > jacob i will leave it with you to coordinate this with everybody and
> > to explain it to them.  once you have restored to the correct master
> > branch point and have followed up with everyone to ensure that they
> > have not done a pull overnight, please let me know and i will restore
> > everybody's write access.
> >
> 
> Ok. I recreated my master branches for soc.git and libreriscv.git after
> creating git tags.
> 
> I checked who all has made any commits in the last week or so, I'm assuming
> that everyone else is not likely to have pulled last night. We still need
> to hear back from Alain, rwilbur, and Tobias (CCed).

I pulled a couple of hours ago. I pushed something a couple of hours ago.

I have several local changes - not pushed.

What do I need to do to get synched with the right tree ?

-- 
Alain Williams
Linux/GNU Consultant - Mail systems, Web sites, Networking, Programmer, IT Lecturer.
+44 (0) 787 668 0256  https://www.phcomp.co.uk/
Parliament Hill Computers Ltd. Registration Information: https://www.phcomp.co.uk/Contact.html
#include <std_disclaimer.h>