Hi Alberto,
the simplest thing would be drop your fork and recreate another one from
scratch. Then just reclone the origin.
If you can't do this because you'd loose some commits that you cannot
recreate easily, then you need to do the rename of branches:
- master -> 3.x
- jbehave-4.x -> master
I'm not too sure if and how github forks allow you do that via the UI
interface.
But if you can opt for simplest solution, it'd be best.
Cheers
On 22/06/2015 13:40, Alberto Scotto wrote:
Hi Mauro,
Sorry, I'm not familiar with this operation, can you please help me?
So, locally I have as remotes:
- origin: https://github.com/alb-i986/jbehave-core
- upstream: https://github.com/jbehave/jbehave-core
And my fork on github <https://github.com/alb-i986/jbehave-core>says
"This branch is 445 commits ahead, 436 commits behind jbehave:master"
What should I do then?
Thanks a lot
Alberto
Il giorno sabato 30 maggio 2015 16:43:45 UTC+1, mauro.talevi ha scritto:
Hello,
Following the releases of 3.10 and 4.0, the branches of JBehave
Core have been reorganised:
* the new master is the old jbehave-4.x branch
* the old master has been renamed to 3.x.
Please ensure that your cloned repos point to the correct ref.
To update the upstream repo:
$ git branch -u origin/<new_name>
Going forward all new development will be on branch master - ie
for 4.x - while the 3.x will only be used for essential bugfixes.
Cheers
--
You received this message because you are subscribed to the Google
Groups "JBehave Dev" group.
To unsubscribe from this group and stop receiving emails from it, send
an email to [email protected]
<mailto:[email protected]>.
To post to this group, send email to [email protected]
<mailto:[email protected]>.
To view this discussion on the web, visit
https://groups.google.com/d/msgid/jbehave-dev/245ab1cf-60a8-41ed-a94e-62169fa761f4%40googlegroups.com
<https://groups.google.com/d/msgid/jbehave-dev/245ab1cf-60a8-41ed-a94e-62169fa761f4%40googlegroups.com?utm_medium=email&utm_source=footer>.
For more options, visit https://groups.google.com/d/optout.
--
You received this message because you are subscribed to the Google Groups "JBehave
Dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send an email to [email protected].
To view this discussion on the web, visit
https://groups.google.com/d/msgid/jbehave-dev/55881E54.1040204%40aquilonia.org.
For more options, visit https://groups.google.com/d/optout.
