[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Git conflicts
From: |
Rune Zedeler |
Subject: |
Git conflicts |
Date: |
Fri, 20 Jun 2008 02:36:29 +0200 |
User-agent: |
Thunderbird 2.0.0.14 (X11/20080502) |
As it has been 9 months since i branched off dev/rune I tried to merge
master into dev/rune to test how it went.
I did
$ git checkout dev/rune
$ git pull --no-commit . master
And then I was flooded with conflicts.
Many conflicts was in files that I did not even change.
How could this happen, and what can I do about it?
(I branched off from 7cfd1d6da86bf8c2eb6391592c84ea361c35ca6d. I have
only changed 24 files. After pull master I had conflicts in almost all
files.)
-Rune
- Git conflicts,
Rune Zedeler <=
- Re: Git conflicts, Rune Zedeler, 2008/06/19
- Re: Git conflicts, Valentin Villenave, 2008/06/20
- Re: Git conflicts, Rune Zedeler, 2008/06/20
- Re: Git conflicts, Valentin Villenave, 2008/06/20
- Re: Git conflicts, Rune Zedeler, 2008/06/20
- Re: Git conflicts, Johannes Schindelin, 2008/06/20
- Re: Git conflicts, Rune Zedeler, 2008/06/20
- Re: Git conflicts, Rune Zedeler, 2008/06/20
- Re: Git conflicts, Rune Zedeler, 2008/06/20