Hi Younghyun, Unfortunately, we are in the same boat as you are and not able to push our latest merges with the master to android-api branch. As I understand, it is on the maintainer?s to-do list to reconsider the restrictions once the details of the branching strategy have been resolved. Best regards, Tim From: ??? [mailto:[email protected]] Sent: Friday, March 20, 2015 3:37 AM To: Kourt, Tim A; ??? Cc: iotivity-dev at lists.iotivity.org Subject: Problem for merging master to android-api
Hi Tim, I have a question for the merging master branch to android-api branch. I'm working on the Protocol Plugin Manager for Android platform on the android-api branch(to use java base api). But android-api branch is too old to develop the PPM, so I want to merge master branch codes to android-api branch. (master -> android-api) When I merged two braches and tried to push into the gerrit.iotivity.org, I met an error likes below. [cid:image001.gif at 01D06323.E5BC6A40] I think it is an authorization problem to merge. Can I get the authorization for the merging branch? If I cannot get the authorization or if it is not the authorization problem, how to make android-api to the newest version like master branch? I look forward to your response. If you have some qusetion about this, feel free to ask me. Thanks, have a good day. Regards Younghyun Joo. #??: ???? ??. ________________________________ Younghyun, Joo | SW Assist Engineer IoT(Internet of Things) Solution Lab., Web & Convergence Team, SoftWare Center, SAMSUNG ELECTRONICS CO., LTD. Mobile +82.10.3794.8718 E_mail yh_.joo at samsung.com<mailto:yh_.joo at samsung.com> ________________________________ [cid:image002.gif at 01D06323.E5BC6A40] [Image removed by sender.] -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.iotivity.org/pipermail/iotivity-dev/attachments/20150320/6d25ec41/attachment.html> -------------- next part -------------- A non-text attachment was scrubbed... Name: ~WRD000.jpg Type: image/jpeg Size: 823 bytes Desc: ~WRD000.jpg URL: <http://lists.iotivity.org/pipermail/iotivity-dev/attachments/20150320/6d25ec41/attachment.jpg> -------------- next part -------------- A non-text attachment was scrubbed... Name: image001.gif Type: image/gif Size: 89097 bytes Desc: image001.gif URL: <http://lists.iotivity.org/pipermail/iotivity-dev/attachments/20150320/6d25ec41/attachment.gif> -------------- next part -------------- A non-text attachment was scrubbed... Name: image002.gif Type: image/gif Size: 13168 bytes Desc: image002.gif URL: <http://lists.iotivity.org/pipermail/iotivity-dev/attachments/20150320/6d25ec41/attachment-0001.gif>
