[git-users] Re: Already up-to-date. Yeeah! -not

2012-05-02 Thread THUFIR HAWAT
On Saturday, 28 April 2012 01:46:25 UTC-7, James Stansell wrote: [...] > The message is telling you that you added three new files and need to use > the "git add" command to add them to your repository. > [...] Allow me to clarify, please, with this question: Tracked files are different betwe

[git-users] Re: Already up-to-date. Yeeah! -not

2012-05-02 Thread Thomas Ferris Nicolaisen
Hi Thufir, You are currently on the branch *gridBagLayout*, which I imagine is branched out from *master*. It therefore happens to contain all the changes that are in *master*. When you type git merge gridBagLayout master, you are basically saying "merge the two branches together, and place th