Re: [git-users] error during git pull

2013-08-30 Thread Huu Da Tran 
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 subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Re: [git-users] error during git pull

2013-08-27 Thread PJ Weisberg 
On Aug 26, 2013 10:46 PM, dexter ietf dexter.i...@gmail.com 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 it with the version from the other branch,
your uncommited version would be lost. Git tries to be very careful about
not losing your work like this.

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Re: [git-users] error during git pull

2013-08-26 Thread dexter ietf 
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 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 afterwards.

 Best,
 Gergely
 On 26 Aug 2013 16:41, dexter ietf dexte...@gmail.com javascript: 
 wrote:

 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 around it.

 error: Entry 'one/tgt' would be overwritten by merge. Cannot merge.
 fatal: merging of trees 4d147268c6e37117525b44272835e5a5c50091f5 and 
 d90cf8aa21afc8d3847b792a2207ea9e3a9f96cf failed
 Merge with strategy recursive failed.

  -- 
 You received this message because you are subscribed to the Google Groups 
 Git for human beings group.
 To unsubscribe from this group and stop receiving emails from it, send an 
 email to git-users+...@googlegroups.com javascript:.
 For more options, visit https://groups.google.com/groups/opt_out.



-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.