
12 Mar
2014
12 Mar
'14
2:32 p.m.
Em Qua, 2014-03-12 às 07:24 -0700, LucaDC escreveu:
c) create a parallel, updated checkout of the current trunk and work on differences, maybe also reverting some other users' changes I don't agree with because they conflict too deeply with my work and my patches are better that theirs ;P
It looks like a bad approach. You should merge the commits, not discard one of them.
If you commit provides what the other commit provides too, then it's okay.
--
Vinícius dos Santos Oliveira
https://about.me/vinipsmaker