recipes_book.md and docs.md pages are ready

Dmitri Popov lazylegs at gmail.com
Sun Apr 9 11:10:24 BST 2017


Ah, I think I've figured that one out. I need to do "git pull origin
dev", and then create a new branch. Right?

Best,
Dmitri

On Sun, Apr 9, 2017 at 12:04 PM, Dmitri Popov <lazylegs at gmail.com> wrote:
> Thanks, Pat,
>
> Hmm, I did "git pull origin master", but I got "Already up-to-date"
> message. What am I doing wrong?
>
> Thanks,
> Dmitri
>
> On Sat, Apr 8, 2017 at 9:42 PM, Pat David <patdavid at gmail.com> wrote:
>> Hi Dmitri!
>>
>> I merged recipes_book.md and also added a link to the sidebar image to go to
>> this page.
>>
>> Not sure about docs.md, though.  There were a bunch of modifications done
>> since you branched I think.
>> I've gone ahead and merged your changes, but to the documentation/_index.md
>> file instead.  Please check it on staging to make sure it's still ok.
>>
>> You might want to rebase your branch against master to pick up all of the
>> changes we've done, or start a fresh branch of your own.  Much of your
>> branch is from before a bunch of changes to the theme and some file
>> structure.  (I am super happy to help you with this if it's not familiar to
>> you).
>>
>> Thank you for fixing these pages! :D
>>
>> On Fri, Apr 7, 2017 at 11:08 AM Dmitri Popov <lazylegs at gmail.com> wrote:
>>>
>>> What the subject says. Both are ready for merging.
>>>
>>> Best,
>>> Dmitri
>>
>> --
>> https://patdavid.net
>> GPG: 66D1 7CA6 8088 4874 946D  18BD 67C7 6219 89E9 57AC



More information about the Digikam-users mailing list