digiKam website: en.yml revised

[Dmitri Popov-2]

... and ready for merge.

Best,
Dmitri

[patdavid]

Merged!

On Wed, Apr 12, 2017 at 9:21 AM Dmitri Popov <[hidden email]> wrote:

... and ready for merge.

Best,
Dmitri

--

[Dmitri Popov-2]

Thanks, Pat!

I can actually merge stuff myself if you are comfortable with me doing that. :-)

Best,
Dmitri

On Wed, Apr 12, 2017 at 7:21 PM, Pat David <[hidden email]> wrote:

> Merged!
>
> On Wed, Apr 12, 2017 at 9:21 AM Dmitri Popov <[hidden email]> wrote:
>>
>> ... and ready for merge.
>>
>> Best,
>> Dmitri
>
> --
> https://patdavid.net
> GPG: 66D1 7CA6 8088 4874 946D  18BD 67C7 6219 89E9 57AC

[patdavid]

I don't mind myself! But I'll defer to Mica since there's still work going on for some things. I don't think there's a problem as you're generally working on content.

On Thu, Apr 13, 2017 at 2:23 AM Dmitri Popov <[hidden email]> wrote:

Thanks, Pat!

I can actually merge stuff myself if you are comfortable with me doing that. :-)

Best,
Dmitri

On Wed, Apr 12, 2017 at 7:21 PM, Pat David <[hidden email]> wrote:
> Merged!
>
> On Wed, Apr 12, 2017 at 9:21 AM Dmitri Popov <[hidden email]> wrote:
>>
>> ... and ready for merge.
>>
>> Best,
>> Dmitri
>
> --
> https://patdavid.net
> GPG: 66D1 7CA6 8088 4874 946D  18BD 67C7 6219 89E9 57AC

--

[Dmitri Popov-2]

Yes, I wouldn't dare touching anything beyond the content. :-)

@Mica What do you say?

Best,
Dmitri

On Thu, Apr 13, 2017 at 2:34 PM, Pat David <[hidden email]> wrote:

> I don't mind myself! But I'll defer to Mica since there's still work going
> on for some things. I don't think there's a problem as you're generally
> working on content.
> On Thu, Apr 13, 2017 at 2:23 AM Dmitri Popov <[hidden email]> wrote:
>>
>> Thanks, Pat!
>>
>> I can actually merge stuff myself if you are comfortable with me doing
>> that. :-)
>>
>> Best,
>> Dmitri
>>
>> On Wed, Apr 12, 2017 at 7:21 PM, Pat David <[hidden email]> wrote:
>> > Merged!
>> >
>> > On Wed, Apr 12, 2017 at 9:21 AM Dmitri Popov <[hidden email]> wrote:
>> >>
>> >> ... and ready for merge.
>> >>
>> >> Best,
>> >> Dmitri
>> >
>> > --
>> > https://patdavid.net
>> > GPG: 66D1 7CA6 8088 4874 946D  18BD 67C7 6219 89E9 57AC
>
> --
> https://patdavid.net
> GPG: 66D1 7CA6 8088 4874 946D  18BD 67C7 6219 89E9 57AC

[Mica Semrick]

You can certainly merge yourself. I would ask the following:

1. Always work on your own branch.
2. Before merging, pull the dev branch
3. After pulling dev, rebase your branch on top of dev
4. Merge your branch into dev

This way, if someone makes commits while you're working, you'll avoid making merge commits.

-m

On April 13, 2017 5:38:09 AM PDT, Dmitri Popov <[hidden email]> wrote:

Yes, I wouldn't dare touching anything beyond the content. :-)

@Mica What do you say?

Best,
Dmitri

On Thu, Apr 13, 2017 at 2:34 PM, Pat David <[hidden email]> wrote:
 I don't mind myself! But I'll defer to Mica since there's still work going
 on for some things. I don't think there's a problem as you're generally
 working on content.
 On Thu, Apr 13, 2017 at 2:23 AM Dmitri Popov <[hidden email]> wrote:

 Thanks, Pat!

 I can actually merge stuff myself if you are comfortable with me doing
 that. :-)

 Best,
 Dmitri

 On Wed, Apr 12, 2017 at 7:21 PM, Pat David <[hidden email]> wrote:
 Merged!

 On Wed, Apr 12, 2017 at 9:21 AM Dmitri Popov <[hidden email]> wrote:

 ... and ready for merge.

 Best,
 Dmitri

 --
 https://patdavid.net
 GPG: 66D1 7CA6 8088 4874 946D  18BD 67C7 6219 89E9 57AC

 --
 https://patdavid.net
 GPG: 66D1 7CA6 8088 4874 946D  18BD 67C7 6219 89E9 57AC