On Wed, 26 Jun 2013 11:18:58 +0530
Shouvik wrote:
> > > Yes, pass the "--no-commit" option to `git merge` and it won't
> > > automatically record a merge commit but will rather leave the
> > > changes staged in the index. Then you'll be able to unstage the
> > > changes made to index.php by runn
On Thu, Jun 20, 2013 at 7:52 PM, Dale R. Worley wrote:
> > From: Konstantin Khomoutov
> >
> > > 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 merge bugfix*
> > >
> > > Th
> From: Konstantin Khomoutov
>
> Well, this is about different mindsets ;-)
> Mine is that if we do not need a set of files, we drop changes in them
> from the index, and then commit.
Quite true -- My approach was when there is a group of changes that
need to be committed, but you want to divide
On Thu, 20 Jun 2013 10:22:25 -0400
wor...@alum.mit.edu (Dale R. Worley) wrote:
[...]
> > Yes, pass the "--no-commit" option to `git merge` and it won't
> > automatically record a merge commit but will rather leave the
> > changes staged in the index. Then you'll be able to unstage the
> > changes
> From: Konstantin Khomoutov
>
> > 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 merge bugfix*
> >
> > The above code will merge all the 3 files i made changes, but is
> > there
On Thu, 20 Jun 2013 17:35:54 +0530
Shouvik wrote:
> > > Suppose I have a project on MASTER branch with 100s of php files.
> > > To do a bug fixing in the project, i create a separate branch
> > >
> > > *>git checkout -b bugfix*
> > >
> > > Then after fixing the bug in 3 files (for eg index.php,
>
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:
On Wed, 19 Jun 2013 22:24:24 -0700 (PDT)
Saurav wrote:
> Suppose I have a project on MASTER branch with 100s of php files. To
> do a bug fixing in the project, i create a separate branch
>
> *>git checkout -b bugfix*
>
> Then after fixing the bug in 3 files (for eg index.php, register.php
> and
Hi
I have a question about GIT.
Suppose I have a project on MASTER branch with 100s of php files. To do a
bug fixing in the project, i create a separate branch
*>git checkout -b bugfix*
Then after fixing the bug in 3 files (for eg index.php, register.php and
login.php), i merge it in the m
