Update main repo with changes

[tsampazk]

Changes include the basic structure commit by @ManosMagnus and work on robot controller classes by @tsampazk

[eakirtas]

Use rebase to update you fork.

git add remote aidudezzz https://github.com/aidudezzz/deepbots
git fetch aidudezzz
git rebase aidudezzz/dev
git push origin master

[tsampazk]

Use rebase to update you fork.

git add remote aidudezzz https://github.com/aidudezzz/deepbots
git fetch aidudezzz
git rebase aidudezzz/dev
git push origin master

I'm updating my fork by merging: 1) pull request from main repo to whatever branch on my fork i want to update 2) pull from my fork remote

According to this https://git-scm.com/book/en/v2/Git-Branching-Rebasing they are equivalent, different methods to get the same result?

[eakirtas]

Yes the result is exactly the same. However with rebase you are end up with a cleaner log history and that's why I prefer it. I feel that we have to make a convention (as the both ways are equally ok). If you don't have any serious disagreement, I propose to use the rebase. If you don't feel comfortable with rebase let me know. https://brokenco.de/2010/04/02/a-rebase-based-workflow.html

[tsampazk]

Yes the result is exactly the same. However with rebase you are end up with a cleaner log history and that's why I prefer it. I feel that we have to make a convention (as the both ways are equally ok). If you don't have any serious disagreement, I propose to use the rebase. If you don't feel comfortable with rebase let me know. https://brokenco.de/2010/04/02/a-rebase-based-workflow.html

Read a few articles about rebase and i'm sold. ;) Indeed it looks a lot cleaner.

[tsampazk]

Is it ok if i use "rebase and merge" option from the dropdown menu here?

[eakirtas]

I think that will be ok

[tsampazk]

@all-contributors please add @tsampazk for code @all-contributors please add @ManosMagnus for code

[allcontributors[bot]]

@tsampazk

I could not determine your intention.

Basic usage: @all-contributors please add @someone for code, doc and infra

For other usages see the documentation

[tsampazk]

@all-contributors please add @tsampazk for code @all-contributors please add @ManosMagnus for code

[allcontributors[bot]]

@tsampazk

I could not determine your intention.

Basic usage: @all-contributors please add @someone for code, doc and infra

For other usages see the documentation

[tsampazk]

@all-contributors please add @tsampazk for code

[allcontributors[bot]]

@tsampazk

I've put up a pull request to add @tsampazk! :tada:

[tsampazk]

@all-contributors please add @ManosMagnus for code

[allcontributors[bot]]

@tsampazk

I've put up a pull request to add @ManosMagnus! :tada:

[tsampazk]

@all-contributors please add @ManosMagnus for code

[allcontributors[bot]]

@tsampazk

I've put up a pull request to add @ManosMagnus! :tada:

[tsampazk]

@all-contributors please add @tsampazk for code

[allcontributors[bot]]

@tsampazk

I've put up a pull request to add @tsampazk! :tada:

[tsampazk]

@all-contributors please add @tsampazk for code

[allcontributors[bot]]

@tsampazk

I've put up a pull request to add @tsampazk! :tada:

[tsampazk]

@all-contributors please add @ManosMagnus for code

[allcontributors[bot]]

@tsampazk

I've put up a pull request to add @ManosMagnus! :tada:

[eakirtas]

@all-contributors please add @tsampazk for code

[allcontributors[bot]]

@ManosMagnus

I've updated the pull request to add @tsampazk! :tada:

[tsampazk]

@all-contributors please add @ManosMagnus for code

[allcontributors[bot]]

@tsampazk

I've put up a pull request to add @ManosMagnus! :tada:

[tsampazk]

@all-contributors please add @tsampazk for code

[allcontributors[bot]]

@tsampazk

I've put up a pull request to add @tsampazk! :tada:

[tsampazk]

@all-contributors please add @ManosMagnus for code

[allcontributors[bot]]

@tsampazk

I've put up a pull request to add @ManosMagnus! :tada:

[tsampazk]

@all-contributors please add @tsampazk for code

[allcontributors[bot]]

@tsampazk

I've put up a pull request to add @tsampazk! :tada: