Re: Re: one more problem with ant

On Mon, Mar 10, 2014 at 9:19 AM, Scott Morgan <[email protected]> wrote:

>
>
> Hi Kevin,
>
>   I thought I did that already;
> https://github.com/adligo/junit
>

That's your fork of https://github.com/junit-team/junit. You pushed your
local changes there. If you want them in JUnit, you first need to issue a
pull request against https://github.com/junit-team/junit

It looks like you made all of your changes on the master branch, which will
most likely cause problems for you in the future. I suggest making a branch.

Ordinarily you would do this in your local repository before coding:

git checkout master
git fetch upstream
git merge upstream/master
git checkout -b test_stats
// write code and commit locally
git push origin test_stats


Since you didn't do this, you'll have to do some minor surgery

git checkout master
git push origin master:test_stats
git branch test_stats origin/test_stats
git reset --hard 95f56b32ef
git push -f origin

See http://stackoverflow.com/a/3790682

-- Kevin


>
> Cheers,
> Scott
>
>
> On Mon, Mar 10, 2014 at 9:42 AM, Kevin Cooney <[email protected]> wrote:
>
>>
>>
>> Feel free to send a pull request when your code is ready. See
>> https://help.github.com/articles/creating-a-pull-request
>>
>>
>  
>