search

dhruvbhagtani / sfc-perturbation-expts

The ocean circulation is driven by a combination of winds and surface buoyancy fluxes. We run a number of experiments with varied surface forcings and look at the spatial variations in ocean circulation on short and long time-scales.
MIT License
2 stars 0 forks source link

`Parameterising-KPP-Shear` branch seems to be unconnected to `main` #16

Closed navidcy closed 2 years ago

navidcy commented 2 years ago
Screen Shot 2021-10-14 at 6 06 15 pm

@dhruvbhagtani, I don't know what you did here, but you don't seem to have branched of main to create the Parameterising-KPP-Shear branch. And this, I believe, won't allow you to merge it back to main. The branches don't share the same history and thus git won't be able to figure out which files to prioritise/merge from the two branches...

dhruvbhagtani commented 2 years ago

Yes, this is something which needs to be sorted. Probably it can be done easily by doing a rebase. I'll try it out.

navidcy commented 2 years ago

you can just delete main (since it's empty!) and rename this branch to main

navidcy commented 2 years ago

But perhaps rebase would do. (I have no idea what rebase is.)

dhruvbhagtani commented 2 years ago

I just did --allow-unrelated-histories and it worked. This was much easier than what stack overflow was saying about rebase (I don't know anything about it either).

navidcy commented 2 years ago

What did you mean "did". What exactly did you do so I can learn? 😀