Re: PHPDoE with Git
| From: | Alexander Moskaliov | Date: | Sat, 07 Jan 2012 09:36:45 +0000 |
| Subject: | Re: PHPDoE with Git | ||
| References: | 1 2 | Groups: | php.doc |
| Request: | Send a blank email to phpdoc+get-969383564@lists.php.net to get a copy of this message | ||
2012/1/7 Alexey Shein <confik@gmail.com>
>
> IIRC, you can do just git checkout, rm is not needed. It's also can be
> done for whole repo, like this: git checkout <repo rootdir here>
>
It does not work with filters, and that's why using rm before checkout.
> Maybe it would be safer use git fetch && git reset --hard
> origin/<branchname> insteadof merge, since merge can be aborted if
> working copy is dirty (uncommited changes) or has some conflicting
> commits. This approach works though if you wish to reject local
> changes and always accept remote ones, anyways, it should be
> thoroughly tested before going into production.
Now, all changes are stored in a separate folder outside of the repository.
All changes are added before committing and after the update repository.
But I think possible use Git reset, we must test it.
With regards, Alexander Moskaliov
Irker@irker.net