On Wed, Sep 5, 2018 at 10:25 AM Stephen & Linda Smith <ischis2@xxxxxxx> wrote: > > Junio - > > On Tuesday, September 4, 2018 10:27:26 AM MST Junio C Hamano wrote: > > > t7500-commit.sh > > > t7501-commit.sh > > > t7502-commit.sh > > > t7509-commit.sh > > > > These seem to have organically grown and it is very likely that ones > > later introduced were added more from laziness. > > How does the project prefer to handle patches that conflict. Renaming t7501- > commit.sh will conflict with a patch set that I submitted over the weekend > [1]. Should I treat them as totally separate? When doing a rename, this should merge fine without much complication, so I'd think it is fine to treat them separately. That way they can be merged to next/master independently.
