Hi dev list,
I saw a section in
about non-tracked merges: "### WHICH MERGES ARE THESE? WHEN ARE THEY
APPROPRIATE? WHEN DO THEY HAPPEN SILENTLY?"
A merge like that would make sense if you wanted to do a Git-style
rebase for whatever reason. You would create a new project branch off
your development branch, cherry-pick all the non-merge changes from
the old project branch onto it (possibly grouping or reordering or
deleting commits), then delete the old branch. The new branch
shouldn't have mergeinfo from the old branch since the old branch is
getting deleted and replaced.
Not sure if you guys want to keep that doc updated; just thought I
would point it out. Also, thanks for Subversion, especially the
automatic reintegration stuff. It's really cool!
Received on 2014-06-26 19:32:45 CEST
This is an archived mail posted to the Subversion Dev