Re: PHPDoE with Git
| From: | Yannick Torrès | Date: | Mon, 09 Jan 2012 12:54:11 +0000 |
| Subject: | Re: PHPDoE with Git | ||
| References: | 1 2 3 | Groups: | php.doc |
| Request: | Send a blank email to phpdoc+get-969383567@lists.php.net to get a copy of this message | ||
Hi Alexander,
Just view your work on Git support. Great work, really !
Once the Git migration done on the documentation, we will be able to back
online the editor in a few time, and test it directly (& fix it too).
Best,
Yannick
2012/1/7 Alexander Moskaliov <irker@irker.net>
>
>
>
> 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
>