Quantcast
Channel: General developer forum
Viewing all articles
Browse latest Browse all 37677

Re: GIT HELP REBASE - MASTER HAS DIVERGED

$
0
0
by Mary Evans.  

Hi Tim,

It looks like I am back agin trying to rebuild MOODLE_23_STABLE after doing the same silly thing as I did earlier this year, by rebasing MDL-35571_M23 incorrectly.

Would it be safe for me to do the same as you suggested earlier in this discussion, that of banishing the old_messed-up_ branch in this case MOODLE_23_STABLE and then getting a new updated version of upstrem MOODLE_23_STABLE...?

Attatched is the state of play with the diverged M23 branch as see using gitk MOODLE_23_STABLE origin/MOODLE_23_STABLE HEAD &

Hope you can help?

Oh...by the way I don't recall seeing the link to your mother's blog before. I was just reading her most recent post...absolutely fantastic! What a wonderful idea.

Cheers

Mary


Viewing all articles
Browse latest Browse all 37677

Trending Articles



<script src="https://jsc.adskeeper.com/r/s/rssing.com.1596347.js" async> </script>