To manually resolve a conflict, follow these steps:
Review the conflicts. Navigate to the classes that are marked for conflict and scroll to the areas with errors. You will notice code that is split by the following markers: <<<<<<<, =======, and >>>>>>>. The top section (HEAD) before the marker ======= contains the old code that was written before the pull, while the bottom section contains the code that was just pulled. Review the differences and delete one of the two, or merge the code together by manually deleting lines. Don’t forget to delete the markers once done.
Add class changes to index.Once all conflicts have been reviewed and edited in a class, right click on the class and navigate to Team > Add to index. Repeat this process for every class with conflicts in your project.
Commit changes. Once all conflicts have been manually resolved, right click on any class and navigate to Team > Commit.
Example of a merge/pull conflict:
Lines of code that are either unchanged from what was pulled, or were automatically resolved because only one side changed.
This is where the code that you wrote goes
This is where the conflicting code that was pulled goes
More lines of code that were cleanly resolved or unmodified.
You should get an invitation to join the telebot repository. Go to your bitbucket inbox to accept it.
Import the telebot project:
Go to: File->Import->Git->Projects from git
At the ‘Import your project from git window’ copy paste the telebot repository URL from your bitbucket account.
Enter your password and click Next.
Eclipse will ask you if you want to create a new project: Select New project wizard and click Next.
Eclipse should have created a directory with the repository. At the new project wizard window uncheck Use default location and browse to the directory of that repository. Select it as the source code for the new project you are about to create. (Do not use the default location).
Version control rules and procedures.
Before making any changes pull from remote repository:
Right click on the project and select: Team->Pull.
To create a serial parser implement the SerialParserInterface.
Implement the setStream(InputStream input, OutputStream output) method. This will give you access to communicate to your device.
To implement your serial parser inside your Manager use the assignInOutStreamsToParser(SerialParserInterface parser) method. See manager tutorial for how to set up DefaultParser (Included in the Telebot core project).
From Thursday June 13 to Saturday June 15, the Discovery Lab hosted an event sponsored by Google. The event is Computer Science for High school Students (CS4HS) and it was a complete success.
The event consisted of several lectures on programming and hardware given by Dr Jong-Hoon Kim and Dr Nagarajan Prabakar, as well as hands on exercises that led to the final project; a remotely controlled robot. There were a total of 24 attendees, each of which was given a kit with all the parts necessary for the project. The attendees not only were taught about the hardware and software needed for the event, but had also the chance to see the Discovery Lab from within.
Although the attendees to the event had many questions and technical problems with the hardware and software, the event went on smoothly thanks to the help of the many volunteers that aided in the process. All the volunteers are members of the Discovery Lab, which allowed the students to have a more personal contact with the lab’s researchers.
Once the event was finished, the attendees were given a certificate of completion as a small memento of the event. Even once the workshop had concluded, many students and teachers wanted to stay and keep working on their projects, proof of their involvement and liking of the event.
Hopefully, more workshops like this one are on their way for the Discovery Lab.
The Discovery Lab will be hosting an event for High School Students sponsored by Google. The event will be taking place starting on Thursday June 13 and will continue until Saturday June 11. Although it took some time, the participants have already been chosen and the event is completely full by now. The event will teach the students how to work with hardware such as the Raspberry Pi and scripting languages related to the hardware being taught. The Discovery Lab will provide breakfast and lunch for the participants, as well as all the materials needed for the Workshop. The members of the Discovery Lab are looking forward to this event.
The Telebot team has a new video update about the improvements the Discovery Lab has performed on the project. The video talks about the many teams that are arduously working on their sections of the Telebot and their jobs. We also present some of the results achieved in the project. Although there is still a long way to the completion of the project, these advancements are proof that our end goal is closer than ever.