You can checkout master and then revert the merge commit while telling it to make the release branch the mainline using:
$ git revert -m 2 HEAD This will make a new commit to master and then I see no diffs when doing: $ git diff master release4.10.0 --Dasa On Jul 26, 2013, at 11:37 PM, Justin Mclean <jus...@classsoftware.com> wrote: > HI, > > There's a lot (1000+ lines) - some make sense (sort of I guess) but other > changes don't and I'm not sure what the best way to fix this is. > > Rather than past all the text here just do a: > git diff origin/release4.10.0 origin/master > > Given that we tag releases - there is the question why we need to merge into > master as all. We don't build off it or make releases off it or even use it > in any meaningful way. > > Is there any way in a few commands to tell master that it should be identical > to the apache-flex-sdk-4.10 tag - because that what we want. > > Thanks, > Justin
