search

clubcapra / markhor

🐐 Capra-Markhor is a ROS-based solution for managing and operating Club Capra's second rescue robot. 🐐
9 stars 1 forks source link

Flippers adjustements #38

Closed benmalenfant closed 1 year ago

benmalenfant commented 2 years ago

To be tested, needs review

benmalenfant commented 2 years ago

Ok now it works but we need to merge @saxtot PR first as this was re-based on that...

Also I need to find a way to squash my 1000 garbage commits

benmalenfant commented 2 years ago

I think we might just delete all the garbage branch i created and re-commit in a new branch based on master, might be beter for review

lvanasse commented 2 years ago

@benmalenfant you could do a rebase and modify or squash your commits.

benmalenfant commented 2 years ago

since i worked on a second branch and merged it, it seems like i can't squash anymore :(

lvanasse commented 2 years ago

What make you say that?

benmalenfant commented 2 years ago

I really feel like eerything I try to fix it is just making it worst

benmalenfant commented 2 years ago

What make you say that?

My gui tool wont let me squash commits after a merge

saxtot commented 1 year ago

@benmalenfant Consider trying to merge this. We will build upon it soon.