Comments (2)
This looks like a bug. Note that --use-merge-strategy
is experimental (and marked as such), and generally not super well behaved, we accepted an MR to add minimal support, but it's not very good yet and I just accepted another one (belatedly) that fixed a bad function call (#102, also see #72).
Meta question: Irrespective of its current state of implementation, are you sure you want to --use-merge-strategy in the first place? Note that you can still can have your source branches merged into master (rather than rebased) by just leaving the default MR strategy in gitlab active (which does that). You only need this options if it's important to you that updating the source branch to the latest commit in the target branch happens via merge rather than rebase (and I'm still not sure why one would want that).
from marge-bot.
I guess the crash happens when a pipeline was run for the branch, but not for its latest commit (assert current_pipeline.sha == commit_sha
), which can happen if pipelines are run manually or if the CI configuration changes. And the problem is having an assert
with no exception handling.
Regarding the merge strategy, I may change my mind, but I don't think rewriting (i.e., rebasing) commits that are already pushed is a good idea. I rebase commits in my local branches, but once it's pushed, it's better not to touch it. (By the way, doesn't rebasing break any signature the commits may have?) I also have to deal with a community of developers who are not git masters and have already been trained to use merge. What marge-bot does should not affect them much, but if there is a conflict and when they are going to fix it the remote repository has rebased the commits that they may have further developed on in their branches... I'm sure it will cause confusion.
from marge-bot.
Related Issues (20)
- Marge-bot logs "Someone skipped the queue! Will have to try again..." even though she merged an MR
- Guarantee final pipeline when assigned to marge-bot
- Bot cannot receive pipeline status with no-ff-merge HOT 10
- feature request: rebase without pushing
- Feature request: let marge bot leave a comment when she notices that an MR was assigned to her
- SSO User Support
- Bug: `--guarantee-final-pipeline` does not work with Gitlab CI
- "Branch cannot be merged" still happening HOT 1
- Source branches are not deleted when using batch mode HOT 4
- LetsEncrypt cert from the included CA Bundle is expired
- Marge Bot is logging PAT while fetching the repository
- Document group access tokens HOT 2
- Marge uses SSH even if I configure it to use HTTPS
- Marge ignores /etc/hosts
- Hard-to-interpret messages when discussions are unresolved
- Feature Request: Configure who to assign if merge doesn't work HOT 1
- Marge-bot container keeps restarting
- A holistic approach to versioning, CICD and audit reporting HOT 1
- Fix merging action when last source commit is not last target commit (gitlab_rebase) HOT 1
- Wait for CI to pass checks happen too fast for Jenkins plugin HOT 1
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from marge-bot.