On 5 January 2015 at 15:43, Stefan Fuhrmann <stefan.fuhrm...@wandisco.com> wrote: > On Fri, Jan 2, 2015 at 2:24 PM, Ivan Zhakov <i...@visualsvn.com> wrote: >> >> On 2 January 2015 at 15:43, <stef...@apache.org> wrote: >> > Author: stefan2 >> > Date: Fri Jan 2 12:43:42 2015 >> > New Revision: 1649012 >> > >> > URL: http://svn.apache.org/r1649012 >> > Log: >> > Merge branches/fsx-id in /trunk, remove the BRANCH-README and >> > resolve trivial conflicts. >> Stefan, >> >> Do I understand correctly that you have merged branch without >> resolving concerns about dirent_t structure naming raised dev@ list >> two weeks ago [1] ? >> >> [1] http://svn.haxx.se/dev/archive-2014-12/0130.shtml >> > > You do. Since there was more than just the dirent_t > structure that should have been renamed, the changes > were beyond the scope of the branch. Moreover, fewer > merge conflicts could be expected by first merging > outstanding changes into FSX and then modifying > hundreds of LOC. > > So, I merged first and went through all non-ID-related > changes later the same day. All nice and consistent > now with moderate work. Makes sense? > Ok, that makes sense.
While it will be easier for reviewer if naming issue was fixed before branch merge. But merge conflicts is argument to do this after merge. -- Ivan Zhakov
