Instead of doing:
git pull remotename remotebranch
Try:
git fetch remotename remotebranch
git checkout remotename/remotebranch
git log conflictingfile
You will still need to rename the file prior to do this.
Hope this helps.
HD.
--
You received this message because you are sub
On Aug 26, 2013 10:46 PM, "dexter ietf" wrote:
>
> i thought this would be the cause and none of my commit
> has one/tgt tracked, i confirmed it by running 'git log'
> which doesn't list 'one/tgt' as a committed file. so i'm
> sure i haven't committed that file.
That means that if git overwrote i
i thought this would be the cause and none of my commit
has one/tgt tracked, i confirmed it by running 'git log'
which doesn't list 'one/tgt' as a committed file. so i'm
sure i haven't committed that file.
On Monday, August 26, 2013 8:15:33 PM UTC+5:30, Gergely Polonkai wrote:
>
> Hello,
>
> a com
Hello,
a commit you are applying has one/tgt tracked. As you have it untracked,
git refuses to overwrite it.
Move one/tgt to one/tgt.backup, do the pull, and check which version do you
want to keep. Or, if you are sure you don't need that file of yours, you
can simply delete it, and do the pull a
I get the following error when doing a 'git pull'
i haven't touched the file 'one/tgt' nor committed
anything related to it, while checking it i found
that 'one/tgt' is an untracked file. why am i getting
this error for an untracked file, why does git care
about an untracked file and how do i get a
