search

colouring-cities / colouring-core

The Core Platform for the Colouring Cities Research Programme (CCRP)
https://colouring-cities.github.io/
GNU General Public License v3.0
47 stars 36 forks source link

Add sample historical footprints #1349

Closed mdsimpson42 closed 3 months ago

mdsimpson42 commented 3 months ago

Can now toggle between:

Deploying to Staging for AI UK.

matkoniecz commented 3 months ago

@mdsimpson42 It looks like you merged UK specific things onto colouring-core like https://github.com/colouring-cities/colouring-core/pull/1349/commits/a312c85904444548f4f46e9c5a7ff766c593db43

matkoniecz commented 3 months ago

I think we should revert it from colouring core and restore earlier version and either apply changes to Colouring Britain or pick up changes relevant in general without bring UK-only parts to Colouring Core.

mdsimpson42 commented 3 months ago

Yes, I know. I only realised afterwards... I have no idea why it seemed to default to core:master instead of Britain:master. I tried to revert it, but I don't think I got it all? I'm so confused!

mdsimpson42 commented 3 months ago

I'm not sure if I reverted the right thing. I also think we might need to check branch protection rules.

Will this PR fix it? #1350

matkoniecz commented 3 months ago

Will this PR fix it? https://github.com/colouring-cities/colouring-core/pull/1350

This seems to has only an empty commit?

I would do

git checkout master
git reset --hard f5abdfed
git push --force upstream

note that upstream needs to be changed to whatever name you assigned to https://github.com/colouring-cities/colouring-core.git

matkoniecz commented 3 months ago

f5abdfed is the last commit before this merge and we have no later valuable commits on this branch, hopefully noone else updated their repo

matkoniecz commented 3 months ago

Oh, and git reset --hard f5abdfed may delete in progress work you have that is not committed on a proper branch (and may orphan some commits that will be recoverable with reflog)

mdsimpson42 commented 3 months ago

Ok, still confused. Do I run these commands in London or Core?

I would do

git checkout master
git reset --hard f5abdfed
git push --force upstream

Also git push --force doesn't work - it asks me to log in and then says Support for password authentication was removed on August 13, 2021.

mdsimpson42 commented 3 months ago

I'd thought I'd found a way around the authentication, but now its saying the branch is protected and it won't let me do it!

matkoniecz commented 3 months ago

Do I run these commands in London or Core?

For core repository - to get rid of this commits even in history

but now its saying the branch is protected and it won't let me do it!

So either you can change setting to unprotect (its whole point is to block --force pushes) temporarily or I can make megacommit reverting all this changes and open PR.

mdsimpson42 commented 3 months ago

OK, I think I've got it now. Sorry for the confusion and thanks for the help!

polly64 commented 3 months ago

See you later

Polly Hudson Senior Research Fellow, The Alan Turing Institute Project Lead: Colouring Cities Research Programme https://www.turing.ac.uk/research/research-projects/colouring-cities-research-programme

The Alan Turing Institute is the UK's national institute for data science and artificial Intelligence. The Alan Turing Institute is a limited liability company, registered in England with registered number 09512457 with registered offices at British Library, 96 Euston Road, London, England, NW1 2DB. We are also a charity registered in England with charity number 1162533. DISCLAIMER: Although we have taken reasonable precautions to ensure the completeness and accuracy of this e-mail, transmission cannot be guaranteed to be secure or error-free as information could be intercepted, corrupted, lost, destroyed, arrive late or be incomplete. If you receive a suspicious or unexpected email from us, or purporting to have been sent on our behalf, particularly containing different bank details, please do not reply to the email, click on any links, open any attachments, or comply with any instructions contained within it. Our Transparency Notice found here - https://www.turing.ac.uk/transparency-notice sets out how and why we collect, store, use and share your personal data and it explains your rights and how to raise concerns with us.

On 14/03/2024, 15:38, "Mike Simpson" @.***> wrote:

OK, I think I've got it now. Sorry for the confusion and thanks for the help!

— Reply to this email directly, view it on GitHubhttps://github.com/colouring-cities/colouring-core/pull/1349#issuecomment-1997746876, or unsubscribehttps://github.com/notifications/unsubscribe-auth/AKCHUYXSL3UGJGIYYLEG75DYYG77PAVCNFSM6AAAAABEWEWT2OVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTSOJXG42DMOBXGY. You are receiving this because you are subscribed to this thread.Message ID: @.***>