Hello,
like the titel already says, I would like to work with GitHub and GitLab simultaneously. I would like to edit some files and share them with my project partner privately over gitlab. I tried to make the current paparazzi folder my gitlab repository, but I couldn't make it work. Is it even possible to work with both simultaneously? Further more, I was playing around with gitlab and somehow I managed to change some stuff of my files and now it does not seem to work anymore. It compiled fine before, and now I get this error task: mcu_periph/uart.c: In function 'uart_periph_init': mcu_periph/uart.c:244:12: error: 'struct link_device' has no member named 'put_buffer' p->device.put_buffer = (put_buffer_t) uart_put_buffer; ^ mcu_periph/uart.c:244:27: error: 'put_buffer_t' undeclared (first use in this function) p->device.put_buffer = (put_buffer_t) uart_put_buffer; ^ mcu_periph/uart.c:244:27: note: each undeclared identifier is reported only once for each function it appears in mcu_periph/uart.c:244:41: error: expected ';' before 'uart_put_buffer' p->device.put_buffer = (put_buffer_t) uart_put_buffer; ^ make[1]: *** [/home/kevin/paparazzi/var/aircrafts/Tiltrotor/ap/mcu_periph/uart.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make[1]: Leaving directory `/home/kevin/paparazzi/sw/airborne' make: *** [ap.compile] Error 2 make: Leaving directory `/home/kevin/paparazzi' FAILED 'make -C /home/kevin/paparazzi -f Makefile.ac AIRCRAFT=Tiltrotor ap.compile' with code 2 Anyone any idea on that? Thanks a lot again, Kevin |
2016-04-16 9:18 GMT+02:00 notoriou5 <[hidden email]>: Hello, Yes, it's possible. git is fundamentally made for decentralized work. Just add the gitlab repo as another remote <https://git-scm.com/book/ch2-5.html>.
-- Pierre-Selim
_______________________________________________ Paparazzi-devel mailing list [hidden email] https://lists.nongnu.org/mailman/listinfo/paparazzi-devel |
In reply to this post by notoriou5
Hello,
It seems that the main code have been updated but not the pprzlink library (which is now a git submodule). Have you re-compiled the whole project (type 'make' in the main folder)? Gautier Le 16/04/2016 09:18, notoriou5 a écrit : > Hello, > > like the titel already says, I would like to work with GitHub and GitLab > simultaneously. I would like to edit some files and share them with my > project partner privately over gitlab. I tried to make the current paparazzi > folder my gitlab repository, but I couldn't make it work. Is it even > possible to work with both simultaneously? > > Further more, I was playing around with gitlab and somehow I managed to > change some stuff of my files and now it does not seem to work anymore. It > compiled fine before, and now I get this error task: > > mcu_periph/uart.c: In function 'uart_periph_init': > mcu_periph/uart.c:244:12: error: 'struct link_device' has no member named > 'put_buffer' > p->device.put_buffer = (put_buffer_t) uart_put_buffer; > ^ > mcu_periph/uart.c:244:27: error: 'put_buffer_t' undeclared (first use in > this function) > p->device.put_buffer = (put_buffer_t) uart_put_buffer; > ^ > mcu_periph/uart.c:244:27: note: each undeclared identifier is reported only > once for each function it appears in > mcu_periph/uart.c:244:41: error: expected ';' before 'uart_put_buffer' > p->device.put_buffer = (put_buffer_t) uart_put_buffer; > ^ > make[1]: *** > [/home/kevin/paparazzi/var/aircrafts/Tiltrotor/ap/mcu_periph/uart.o] Error 1 > make[1]: *** Waiting for unfinished jobs.... > make[1]: Leaving directory `/home/kevin/paparazzi/sw/airborne' > make: *** [ap.compile] Error 2 > make: Leaving directory `/home/kevin/paparazzi' > > FAILED 'make -C /home/kevin/paparazzi -f Makefile.ac AIRCRAFT=Tiltrotor > ap.compile' with code 2 > > Anyone any idea on that? > > Thanks a lot again, > > Kevin > > > > -- > View this message in context: http://lists.paparazziuav.org/Working-with-GitHub-and-GitLab-simultaneously-tp17905.html > Sent from the paparazzi-devel mailing list archive at Nabble.com. > > _______________________________________________ > Paparazzi-devel mailing list > [hidden email] > https://lists.nongnu.org/mailman/listinfo/paparazzi-devel _______________________________________________ Paparazzi-devel mailing list [hidden email] https://lists.nongnu.org/mailman/listinfo/paparazzi-devel |
Free forum by Nabble | Edit this page |