Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: resolve issue with batching MRs and forked MRs (#302) #322

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: resolve issue with batching MRs and forked MRs (#302) #322

wants to merge 1 commit into from

Commits on Mar 30, 2022

  1. fix: resolve issue with batching MRs and forked MRs (smarkets#302) 

    Since all forked MRs are prepared to local branches, the MR
acceptance procedure needs to be also local.

* fix batching MRs when source branch has different repo url
* fix unit tests
* add unit test for use case forked MRs
* remove credentials from debug log

Changes:
/tmpiq7raaob/tmpb84bjxf0 # git merge origin/dummy21 --ff --ff-only
merge: origin/dummy21 - not something we can merge

Into:
/tmpiq7raaob/tmpb84bjxf0 # git merge dummy21 --ff --ff-only
Updating b51f541..9525b89
Fast-forward
 21 | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 21

Signed-off-by: Sascha Binckly <[email protected]>
    @sg70
    sg70 committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    241409d View commit details
    Browse the repository at this point in the history