Re: untracked file deleted from the master branch, when checked out to it from a local branch

2014-05-21 Thread Sergei Organov
Arup Rakshit arupraks...@rocketmail.com writes: [...] Now you can see, that I have created, a new file called *file.txt*, in the *master branch*. And here is your basic misunderstanding. You've created file.txt indeed, but not in the *master branch* (or any branch). You've created it in the

untracked file deleted from the master branch, when checked out to it from a local branch

2014-05-20 Thread Arup Rakshit
I was following some tutorial (http://gitref.org/branching/#merge) - and doing it in my console : Arup-iMac:arup_git shreyas$ git status # On branch master nothing to commit, working directory clean Arup-iMac:arup_git shreyas$ touch test.rb Arup-iMac:arup_git shreyas$ ls git_1.txttest.rb

Re: untracked file deleted from the master branch, when checked out to it from a local branch

2014-05-20 Thread Marius Storm-Olsen
On 5/20/2014 10:38 AM, Arup Rakshit wrote: I was following some tutorial (http://gitref.org/branching/#merge) - and doing it in my console : Arup-iMac:arup_git shreyas$ git status # On branch master nothing to commit, working directory clean Arup-iMac:arup_git shreyas$ touch test.rb

Re: untracked file deleted from the master branch, when checked out to it from a local branch

2014-05-20 Thread Arup Rakshit
On Tuesday, May 20, 2014 11:56:57 AM you wrote: On 5/20/2014 10:38 AM, Arup Rakshit wrote: I was following some tutorial (http://gitref.org/branching/#merge) - and doing it in my console : Because you never committed the original file to the master branch before you created and switched

Re: untracked file deleted from the master branch, when checked out to it from a local branch

2014-05-20 Thread Marius Storm-Olsen
On 5/20/2014 11:03 AM, Arup Rakshit wrote: On Tuesday, May 20, 2014 11:56:57 AM you wrote: On 5/20/2014 10:38 AM, Arup Rakshit wrote: I was following some tutorial (http://gitref.org/branching/#merge) - and doing it in my console : Because you never committed the original file to the

Re: untracked file deleted from the master branch, when checked out to it from a local branch

2014-05-20 Thread Arup Rakshit
On Tuesday, May 20, 2014 12:06:49 PM you wrote: It never came to the new branch, as it was never version controlled, it was an untracked file left behind when you switched branches. Once you added it to the new branch, change_class, it became a version controlled file, This is still

Re: untracked file deleted from the master branch, when checked out to it from a local branch

2014-05-20 Thread Junio C Hamano
Arup Rakshit arupraks...@rocketmail.com writes: On Tuesday, May 20, 2014 12:06:49 PM you wrote: It never came to the new branch, as it was never version controlled, it was an untracked file left behind when you switched branches. Once you added it to the new branch, change_class, it

Re: untracked file deleted from the master branch, when checked out to it from a local branch

2014-05-20 Thread Marius Storm-Olsen
On 5/20/2014 12:20 PM, Arup Rakshit wrote: On Tuesday, May 20, 2014 12:06:49 PM you wrote: It never came to the new branch, as it was never version controlled, it was an untracked file left behind when you switched branches. Once you added it to the new branch, change_class, it became a

Re: untracked file deleted from the master branch, when checked out to it from a local branch

2014-05-20 Thread Arup Rakshit
On Tuesday, May 20, 2014 11:24:11 AM you wrote: Arup Rakshit arupraks...@rocketmail.com writes: Untracked files and modifications to files in your working directory do not belong to your current branch. This is to allow you, after starting to work on one branch then realizing that the

Re: untracked file deleted from the master branch, when checked out to it from a local branch

2014-05-20 Thread Marius Storm-Olsen
On 5/20/2014 12:40 PM, Arup Rakshit wrote: On Tuesday, May 20, 2014 11:24:11 AM you wrote: Arup Rakshit arupraks...@rocketmail.com writes: Untracked files and modifications to files in your working directory do not belong to your current branch. This is to allow you, after starting to work on