Junio C Hamano wrote: > "Lars Hjemli" <hjemli@xxxxxxxxx> writes: > >> On 9/18/07, Eric Wong <normalperson@xxxxxxxx> wrote: >>> Would automatically enabling --no-ff when it detects merging of two (or >>> more) SVN branches be a good thing? >> I'd say 'git-svn merge' as a wrapper for 'git merge --no-ff' would be cleaner. > > That unfortunately does not solve the problem. I think we 'just' need to fix pushing merges back to SVN - so that they properly set Subversion 1.5+ (and possibly SVK) merge attributes - and if it is ambiguous which branch to push to, force the user to decide. Sam. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
