Merging of dev branches into main

[rmndrs89]

Dear both,

first of all a shout out to the both of you for delivering such high quality work! My gut feeling is that we are driving this in the right direction! Obviously, we will also learn from each other and with time, but the efforts are amazing!

Now, to the point: this morning I have tried to merge @masoudabedinifar 's great work into the main branch following these instructions:

$ git pull
$ git checkout dev-masoud
$ git merge main
$ git push -u origin main

This, however, gave some conflicts, and told me that I needed to get remote updates in first (which I already did, or at least thought so):

hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint: 
hint:   git config pull.rebase false  # merge (the default strategy)
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint: 
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.

But so I did the following:

$ git config pull.rebase false
$ git pull
Username for 'https://github.com': rmndrs89
Password for 'https://rmndrs89@github.com': 
Merge made by the 'ort' strategy.
 .github/workflows/black.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .github/workflows/black.yml

So I guess it was just related to the black.yml file that was created by @JuliusWelzel.

QUestion to @JuliusWelzel and @masoudabedinifar - is this the foreseen approach to merge branches?

Next steps would be that maybe @masoudabedinifar checks if everything works for him when he pulls the remote main branch now?

Best regards, Robbin

[JuliusWelzel]

shout out to the both of you

Shout out to you as well! I really like where this is heading :)

I will have a look, and maybe revert the black linting for the moment. @masoudabedinifar I will try to merge your branch today and let you know if I encounter difficulties :)

[JuliusWelzel]

All merged, @masoudabedinifar, if your dev-masoud is free from new commits, you can safely delete that branch and open a new one if you want

[masoudabedinifar]

Dear both,

Thank you both for your dedication and positive feedback on the progress so far! It's great to see the collaboration moving in the right direction :).

Thank you @rmndrs89 for sharing your effort in merging work into the main branch.

Thank you @JuliusWelzel for taking care of merging the branch.

Then I am going to delete dev-masoud branch and keep going on translating the Initial Contact Detection to python.

Best regards, Masoud.

[JuliusWelzel]

Perfect, you can name the new branch according to the feature, for example: dev-ICD

[masoudabedinifar]

Thank you @JuliusWelzel, I deleted and created a new branch named dev-ICD and I will commit & push my updates from this branch.

[JuliusWelzel]

@rmndrs89 please pull from main to be up to date