|
| From: | Rune Zedeler |
| Subject: | Re: Git conflicts |
| Date: | Fri, 20 Jun 2008 02:48:06 +0200 |
| User-agent: | Thunderbird 2.0.0.14 (X11/20080502) |
Rune Zedeler skrev:
(I branched off from 7cfd1d6da86bf8c2eb6391592c84ea361c35ca6d. I have only changed 24 files. After pull master I had conflicts in almost all files.)
More specifically: I had conflicts in 334 files. -Rune
| [Prev in Thread] | Current Thread | [Next in Thread] |