Eric, are you aware of Stefan's wait state on Git support of
vc-find-conflicted-file and is this something you are inclined to punt on?

On Sun, Aug 10, 2014 at 4:56 PM, Eric S. Raymond <esr@thyrsus.com> wrote:

> Paul Michael Reilly <pmr@pajato.com>:
> > Haven't noticed any messages in a while on the project to move Emacs
> > development from bzr to git.  Not since January really.  Did I miss
> > something that has shelved the project?  Or maybe it is done and it is
> the
> > best kept secret since esr fired his first shot at Bazaar many months
> ago.
> > Or that daunting list of final things to do has proven even more stubborn
> > than even rms himself can be. :-)
> >
> > -pmr
>
> You haven't heard much about it because the hard work is all done. I
> have the scripts ready to go and need only about eight hours' notice
> before pushing the button.
>
> That is, assuming everyone has played nice and not embedded more bzr
> revision numbers in ChangeLogs or revision comments - if someone
> slipped on that then I will need to do another revision of the
> conversion recipe and another conversion run (they take about eight
> hours - it's a big repository).
>
> You can pull a copy of the transition recipe and associated scripts from
> here:
>
> git://gitorious.org/emacs-transition/emacs-transition.git
>
> I've documented the whole process; you can do a trial conversion yourself
> if you care to try.
>

What I would like to do is grab hold of workflow documentation, assuming it
exists, on how to use the converted git repo to build from current
development sources and test it out on a few Mac systems.  Sounds like four
pieces need to come together: 1) 24.4 gets released, 2)
vc-find-conflicted-file has Stefan satisfied, 3) workflow documentation is
updated and 4) you have pushed the button after being convinced it is time.
 1) is in progress, 2) and 3) are in an unknown state, and 4) appears to be
ready.  It would be good to get more insight into plans, if any, to address
2) and 3).

-pmr