As discussed in
https://groups.google.com/forum/#!topic/git-users/uR7gzLL2Ovc:
I ran git merge to merge a branch. There were some conflicted files.
Although they were automatically resolved by git rerere, I still had to add
them. I accidentally ran git add . instead of git add -u. I noticed my
André Hänsel an...@webkr.de writes:
I ran git merge to merge a branch. There were some conflicted files.
Although they were automatically resolved by git rerere, I still had to add
them.
If you want them to be added automatically, set rerere.autoupdate=true.
Andreas.
--
Andreas Schwab,
Andreas Schwab sch...@linux-m68k.org writes:
André Hänsel an...@webkr.de writes:
I ran git merge to merge a branch. There were some conflicted files.
Although they were automatically resolved by git rerere, I still had to add
them.
If you want them to be added automatically, set
Junio C Hamano gits...@pobox.com writes:
Andreas Schwab sch...@linux-m68k.org writes:
André Hänsel an...@webkr.de writes:
I ran git merge to merge a branch. There were some conflicted files.
Although they were automatically resolved by git rerere, I still had to add
them.
If you want
On Mon, Sep 15, 2014 at 2:54 PM, Andreas Schwab sch...@linux-m68k.org wrote:
Junio C Hamano gits...@pobox.com writes:
Andreas Schwab sch...@linux-m68k.org writes:
André Hänsel an...@webkr.de writes:
I ran git merge to merge a branch. There were some conflicted files.
Although they were
Junio C Hamano gits...@pobox.com writes:
On Mon, Sep 15, 2014 at 2:54 PM, Andreas Schwab sch...@linux-m68k.org wrote:
Junio C Hamano gits...@pobox.com writes:
Andreas Schwab sch...@linux-m68k.org writes:
André Hänsel an...@webkr.de writes:
I ran git merge to merge a branch. There were
6 matches
Mail list logo