Re: [git-users] Merging hotfix without merging all files.

2013-06-25 Thread Shouvik
On Thu, Jun 20, 2013 at 7:52 PM, Dale R. Worley wor...@alum.mit.edu wrote: From: Konstantin Khomoutov flatw...@users.sourceforge.net Then after fixing the bug in 3 files (for eg index.php, register.php and login.php), i merge it in the master branch *git checkout master **git

Re: [git-users] Merging hotfix without merging all files.

2013-06-20 Thread Shouvik
But u cannot switch branch without commiting first right? and in order or merge a branch u need to checkout to the master branch. no? Or am I missing something? Can u specify the steps pls? Thanks On Thu, Jun 20, 2013 at 5:29 PM, Konstantin Khomoutov flatw...@users.sourceforge.net wrote: