[ell-i-developers] Re: My new forked repository

  • From: Asif Sardar <engr.asif.sardar@xxxxxxxxxxxxxx>
  • To: Teemu Hakala <temmi@xxxxxx>, Eero Hakala <eero.k.hakala@xxxxxxxxx>, Ivan Raul <supra.material@xxxxxxxxx>, Otso Jousimaa <otso.jousimaa@xxxxxxxxx>, "ell-i-developers@xxxxxxxxxxxxx" <ell-i-developers@xxxxxxxxxxxxx>
  • Date: Tue, 24 Feb 2015 23:35:36 +0200

Now we need to merge Ivan's feature-hrtim branch to my master branch, so
that we can put this repository link the dockerfile to create automated
build images.

For that, Ivan needs to pull my master branch, commit his changes to that
branch (either by merging his branch, fixing it, testing it and making pull
request to me or by changing the files manually).

After this commit, we will have latest work in the docker images!

On Tue, Feb 24, 2015 at 11:32 PM, Asif Sardar <
engr.asif.sardar@xxxxxxxxxxxxxx> wrote:

> Hello everyone,
> I tried merging different branches (master, feature-encx24j600-wip and
> Ivan's feature-hrtim branch), it just messed my own remote repository, due
> to my inexperience in git and stupid mistakes. But, it was a good learning
> experience!
> I messed up my forked repository from Ell-i/Runtime, so I deleted it,
> forked again from the Ell-i/Runbtime, added emulator enhancements again,
> corrected the problem with undefined reference to __peripheral_start &
> __peripheral_end and pushed it to my remote repository, that is,
> https://github.com/asifsardar26/Runtime.git
> I have made pull request to Pekka about the emulator enhancements to be
> merged to Ell-i/Runtime.
> --
> *With Best Regards,Asif Sardar.+358 43 8265795 <%2B358%2043%208265795>*


*With Best Regards,Asif Sardar.+358 43 8265795*

Other related posts: