[git-users] Re: Strange untracked files after a conflicted git cherry-pick.

2014-02-21 Thread seonguk.baek
Thanks for your reply It is very difficult and complicate to reproduce the situation. I'm on version 1.9.0. And I'm also tried on 1.8.x Thanks to good way. Is there any way that resolve using git command like you mentioned that git checkout file --theirs. -- You received this message because y

[git-users] Re: Strange untracked files after a conflicted git cherry-pick.

2014-02-20 Thread Thomas Ferris Nicolaisen
On Friday, February 21, 2014 2:07:58 AM UTC+1, seonguk.baek wrote: > > Hello guys. > > I got strange file. > > I've cherry-picked the commit. > And Git says : > > > > Why this untracked files occurs? > And How can I resolve this? > Normally, Git will help you resolve conflicts between two ve