Spike build question

I want to put my NCList branch on to spikes/mungo, but not merge it on.

Can I just delete the local and remote spike branch and then recreate it?

Or is there a better way?

m

The University of Dundee is a registered Scottish Charity, No: SC015096

···

Email signature

University of Dundee shield logo

Mungo Carstairs
Jalview Computational Scientist

The Barton Group
Division of Computational Biology

School of Life Sciences

University of Dundee, Dundee, Scotland, UK

www.jalview.org

www.compbio.dundee.ac.uk
g.m.carstairs@dundee.ac.uk

University of Dundee FacebookUniversity of Dundee TwitterUniversity of Dundee LinkedInUniversity of Dundee YouTubeUniversity of Dundee InstagramUniversity of Dundee Snapchat
We’re Scottish University of the Year again!
The Times / Sunday Times Good University Guide 2016 and 2017

You can use the git reset command:

git checkout
git rest --hard

Cheers,
Charles

Ofoegbu Tochukwu Charles
Jalview Visual Analytics Developer/Scientist
The Barton Group
Division of Computational Biology
School of Life Sciences
University of Dundee, Dundee, Scotland, UK.
Skype: cofoegbu
www.jalview.org
www.compbio.dundee.ac.uk

···

Email signature

University of Dundee shield logo
Mungo Carstairs
Jalview Computational Scientist
The Barton Group
Division of Computational Biology
School of Life Sciences
University of Dundee, Dundee, Scotland, UK
www.jalview.org
www.compbio.dundee.ac.uk
g.m.carstairs@dundee.ac.uk

University of Dundee FacebookUniversity of Dundee TwitterUniversity of Dundee LinkedInUniversity of Dundee YouTubeUniversity of Dundee InstagramUniversity of Dundee Snapchat
We’re Scottish University of the Year again!
The Times / Sunday Times Good University Guide 2016 and 2017

Thanks for the suggestion Charles.

I tried

git reset --hard features/JAL2446NCList

and got

fatal: ambiguous argument ‘features/JAL2446NCList’: unknown revision or path not in the working tree.

Use ‘–’ to separate paths from revisions

I then tried

git reset --hard – features/JAL2446NCList

and got

fatal: Cannot do hard reset with paths.

At this stage my nerve failed me, but fortunately I got it work through eGit.

Mungo

···

Email signature

University of Dundee shield logo

Mungo Carstairs
Jalview Computational Scientist

The Barton Group
Division of Computational Biology

School of Life Sciences

University of Dundee, Dundee, Scotland, UK

www.jalview.org

www.compbio.dundee.ac.uk
g.m.carstairs@dundee.ac.uk

University of Dundee FacebookUniversity of Dundee TwitterUniversity of Dundee LinkedInUniversity of Dundee YouTubeUniversity of Dundee InstagramUniversity of Dundee Snapchat
We’re Scottish University of the Year again!
The Times / Sunday Times Good University Guide 2016 and 2017


From: jalview-dev-bounces@jalview.org jalview-dev-bounces@jalview.org on behalf of Charles Ofoegbu (Staff) t.c.n.ofoegbu@dundee.ac.uk
Sent: 09 June 2017 14:40:42
To: Jalview Development List
Subject: Re: [Jalview-dev] Spike build question

You can use the git reset command:

git checkout
git rest --hard

Cheers,
Charles

Ofoegbu Tochukwu Charles
Jalview Visual Analytics Developer/Scientist
The Barton Group
Division of Computational Biology
School of Life Sciences
University of Dundee, Dundee, Scotland, UK.
Skype: cofoegbu
www.jalview.org
www.compbio.dundee.ac.uk

On 9 Jun 2017, at 14:31, Mungo Carstairs (Staff) <g.m.carstairs@dundee.ac.uk> wrote:

I want to put my NCList branch on to spikes/mungo, but not merge it on.
Can I just delete the local and remote spike branch and then recreate it?
Or is there a better way?

m

The University of Dundee is a registered Scottish Charity, No: SC015096_______________________________________________
Jalview-dev mailing list
Jalview-dev@jalview.org
http://www.compbio.dundee.ac.uk/mailman/listinfo/jalview-dev

The University of Dundee is a registered Scottish Charity, No: SC015096

The University of Dundee is a registered Scottish Charity, No: SC015096

Email signature

University of Dundee shield logo
Mungo Carstairs
Jalview Computational Scientist
The Barton Group
Division of Computational Biology
School of Life Sciences
University of Dundee, Dundee, Scotland, UK
www.jalview.org
www.compbio.dundee.ac.uk
g.m.carstairs@dundee.ac.uk

University of Dundee FacebookUniversity of Dundee TwitterUniversity of Dundee LinkedInUniversity of Dundee YouTubeUniversity of Dundee InstagramUniversity of Dundee Snapchat
We’re Scottish University of the Year again!
The Times / Sunday Times Good University Guide 2016 and 2017

I then tried

git reset --hard -- features/JAL2446NCList

and got

fatal: Cannot do hard reset with paths.

the right order is:
git reset --hard <branchname> --

At this stage my nerve failed me, but fortunately I got it work through
eGit.

well done!
Jim

···

On 10/06/2017 01:51, Mungo Carstairs (Staff) wrote:

--
-------------------------------------------------------------------
Dr JB Procter, Jalview Coordinator, The Barton Group
Division of Computational Biology, School of Life Sciences
University of Dundee, Dundee DD1 5EH, UK.
+44 1382 388734 | www.jalview.org | www.compbio.dundee.ac.uk