search

oscam-emu / oscam-patched

Open Source Cam Emulator
GNU General Public License v3.0
6 stars 6 forks source link

Fix sync workflow to properly push commits #7

Closed WXbet closed 2 months ago

nautilus7 commented 2 months ago

Fixes #6

WXbet commented 2 months ago

Can you please merge the changes to master branch? Seems I dont have write access.

nautilus7 commented 2 months ago

I thought I fixed write access the day before yesterday... Argh...

nautilus7 commented 2 months ago

Can you please merge the changes to master branch? Seems I dont have write access.

Our two current branches are protected and allow commiting via pull requests only. Are you sure you can't merge your PRs?

WXbet commented 2 months ago

Ah okay. I'll check it, wait. This option? image

nautilus7 commented 2 months ago

Either with merge commit, or with rebase. I don't care.

Rebase is cleaner, but merge commit maybe heps better distinguish between oscam commits and emu only commits.

WXbet commented 2 months ago

Rebase did the job fine :-) No wait, the commit sha's are not identical :-(

nautilus7 commented 2 months ago

No it didn't.... My fault. Should have thought better before saying that.

nautilus7 commented 2 months ago

I'll reset and make merge commit. Sorry

WXbet commented 2 months ago

Okay thank you. Merge is our way!