Hello Hao

Le 14/05/2018 à 12:39, phuong hao nguyen thi a écrit :

> I created a new repository in git :
> https://github.com/haonguyen123/SIS-GSOC2018
> Can you check for me it ok ?

I think it would have been easier to use the "Fork" button on
https://github.com/apache/sis. The result would have been the same, but
git would "remember" that the code come from Apache SIS, which would
make the merges easier.

If you want, you can try to fix as below. First save your changes:

    git show 2cc8c05 > commit1.patch git show 144b5b4 > commit3.patch

Then you can delete the SIS-GSOC2018 clone by clicking on the "settings"
tab, and "delete" somewhere close to the bottom of the page.

Next you can go on https://github.com/apache/sis and click on "Fork". I
think that you can reuse SIS-GSOC2018 for the name of your fork if you
wish. Then:

    cd SIS-GSOC2018
    git checkout JDK8
    patch -p1< commit1.patch patch -p1 <commit3.patch

The two "patch" instructions apply the changes that you saved
previously. You may need to use a more complete path for the
"commit?.patch" files. Next you can commit and push.

    Martin


Reply via email to