On Sat, Apr 28, 2012 at 8:42 AM, Stephan Gambke <s7eph4n(a)gmail.com> wrote:
Am 28.04.2012 14:37, schrieb Chad:
If you start changing files or trying to merge
branches then
you run the risk of getting conflicts...
Even on files I did not even touch?
If you didn't touch them, then I don't know how
there would be a conflict.
-Chad