Okay, Justin responded at the same time as I sent mine.

Here are the correct instructions:

- Fork off of the 4.15.0 branch on github
- Clone the fork onto your local computer
- Apply the fixes in your local computer (no need to create a new branch)
- Commit and push your changes to your fork on github
- Send a pull request.

Thanks,
Om

On Mon, Dec 21, 2015 at 10:44 PM, OmPrakash Muppirala <bigosma...@gmail.com>
wrote:

> I am guessing that the new branch + merging caused this issue
>
> Here is the most straightforward way I would recommend:
>
> - Fork off of the dev branch on github
> - Clone the fork onto your local computer
> - Apply the fixes in your local computer (no need to create a new branch)
> - Commit and push your changes to your fork on github
> - Send a pull request.
>
> Hope this helps.
>
> Thanks,
> Om
>
> On Mon, Dec 21, 2015 at 10:19 PM, OK <okrue...@edscha.com> wrote:
>
>> I've just seen that my pull request contains 12 commits instead of 2.
>> Seems that other commits from other users are included in my pull request
>> cause I target the 4.15.0 branch for merging.
>> Should I target the develop branch instead of the 4.15.0 branch?
>>
>> Olaf
>>
>>
>>
>> --
>> View this message in context:
>> http://apache-flex-development.2333347.n4.nabble.com/4-15-0-Update-FontAwesome-icon-lib-to-4-5-tp50737p50753.html
>> Sent from the Apache Flex Development mailing list archive at Nabble.com.
>>
>
>

Reply via email to