Re: [git-users] undoing git init?

2016-08-15 Thread Magnus Therning
Pablo Rodríguez writes: > Dear list, > > I wanted to initialize a git repo in a directory, but I mistakenly > reinitialized an existing repo in another directory. > > Two basic questions: > > - How can I undo this? (All files from this repo have been removed [as > anyone should expect].) > > - I

Re: [git-users] undoing git init?

2016-08-15 Thread Pablo Rodríguez
On 08/13/2016 08:47 AM, Gabby Romano wrote: > The parent git repo didn't recognise the action you did there? If it > did, you may try working with tour try to recover the files.in > general,redoing git init is deleting the .git folder... Hi Gabby, after practising with a brand new repository, I r

Re: [git-users] undoing git init?

2016-08-15 Thread Pablo Rodríguez
On 08/15/2016 10:58 AM, Magnus Therning wrote: > Pablo Rodríguez writes: > >> Dear list, >> >> I wanted to initialize a git repo in a directory, but I mistakenly >> reinitialized an existing repo in another directory. >> >> Two basic questions: >> >> - How can I undo this? (All files from this rep

Re: [git-users] git merge -- resolving conflicts?

2016-08-15 Thread Konstantin Khomoutov
On Sat, 13 Aug 2016 18:15:17 -0700 Michael_google gmail_Gersten wrote: [...] > > > After I've done the "git merge" and it has failed, how can I then > > > auto-select on a file by file basis? > > > > I think you want > > > > $ git checkout --ours . > > $ git add -u > > $ git commit > > > >

Re: [git-users] git merge -- resolving conflicts?

2016-08-15 Thread Michael
On 2016-08-15, at 7:16 AM, Konstantin Khomoutov wrote: > On Sat, 13 Aug 2016 18:15:17 -0700 > Michael_google gmail_Gersten wrote: > > [...] After I've done the "git merge" and it has failed, how can I then auto-select on a file by file basis? >>> >>> I think you want >>> >>> $ gi