Someone was complaining about the branch name v2.1.x being confusing now were on 2.2.0. There's no point in maintaining a branch for v2.1.x because there's never going to be further development. To fixup branches in your fork: git branch -m v2.1.x v2.x.x git config branch.v2.x.x.merge refs/head/v2.x.x git push origin v2.x.x git push origin :v2.1.x -Arran
On 10/28/2012 10:12 AM, Arran Cudbard-Bell wrote:
Someone was complaining about the branch name v2.1.x being confusing now were on 2.2.0. There's no point in maintaining a branch for v2.1.x because there's never going to be further development.
To fixup branches in your fork:
Eww.. Related: has something funny happened to the "master" branch: From git://github.com/FreeRADIUS/freeradius-server + 15433ac...d7b1d55 master -> upstream/master (forced update) ...and when I merge "upstream/master" into "master" I didn't get a fast-forward merge, which I should because I keep my "master" pristine, and only ever branch it.
On 10/28/2012 12:19 PM, Phil Mayers wrote:
On 10/28/2012 10:12 AM, Arran Cudbard-Bell wrote:
Someone was complaining about the branch name v2.1.x being confusing now were on 2.2.0. There's no point in maintaining a branch for v2.1.x because there's never going to be further development.
To fixup branches in your fork:
Eww..
Related: has something funny happened to the "master" branch:
Oh dear... "funny" is a bit of an understatement. It looks like we've gone back in time 9 months.
On 28 Oct 2012, at 12:23, Phil Mayers <p.mayers@IMPERIAL.AC.UK> wrote:
On 10/28/2012 12:19 PM, Phil Mayers wrote:
On 10/28/2012 10:12 AM, Arran Cudbard-Bell wrote:
Someone was complaining about the branch name v2.1.x being confusing now were on 2.2.0. There's no point in maintaining a branch for v2.1.x because there's never going to be further development.
To fixup branches in your fork:
Eww..
Related: has something funny happened to the "master" branch:
Oh dear... "funny" is a bit of an understatement. It looks like we've gone back in time 9 months.
Yeah something extremely weird happened when I tried to merge some guys changes back in. I've now corrected it. You might have to dig out the last few commits and git pull to get back to the correct HEAD ref. -Arran
Arran Cudbard-Bell wrote:
Yeah something extremely weird happened when I tried to merge some guys changes back in. I've now corrected it.
Uh... "git reset --hard HEAD^^^^", followed by "git pull", followed by another attempt at merging.
You might have to dig out the last few commits and git pull to get back to the correct HEAD ref.
I see a number of commits I made were re-done. I'd like to avoid these kinds of issues. Alan DeKok.
On 28 Oct 2012, at 16:37, Alan DeKok <aland@DEPLOYINGRADIUS.COM> wrote:
Arran Cudbard-Bell wrote:
Yeah something extremely weird happened when I tried to merge some guys changes back in. I've now corrected it.
Uh... "git reset --hard HEAD^^^^", followed by "git pull", followed by another attempt at merging.
Something really bizarre happened when I tried to cherrypick directly from a tracking branch from the guy who submitted the perl tagged attribute pull request. It didn't include the correct author id, and when I did a rebase -i HEAD~2 e, git commit --ammend --author <blah>, rebase --continue it didn't do the rebase correctly and set the original commit as the HEAD ref which was why the repo was reset to the state it was nine months in the past. I think this was a bug in tower, so i'll just use the git CLI to do this sort of thing in future.
You might have to dig out the last few commits and git pull to get back to the correct HEAD ref.
I see a number of commits I made were re-done.
Yes i'll claim responsibility on that one, sorry. -Arran
On 28 Oct 2012, at 15:26, Brian Candler <B.Candler@pobox.com> wrote:
On Sun, Oct 28, 2012 at 10:12:29AM +0000, Arran Cudbard-Bell wrote:
To fixup branches in your fork:
git branch -m v2.1.x v2.x.x git config branch.v2.x.x.merge refs/head/v2.x.x
should be "refs/heads/v2.x.x" I believe -
Well spotted. -Arran
participants (4)
-
Alan DeKok -
Arran Cudbard-Bell -
Brian Candler -
Phil Mayers