Stuck on an issue?
Lightrun Answers was designed to reduce the constant googling that comes with debugging 3rd party libraries. It collects links to all the places you might be looking at while hunting down a tough bug.
And, if you’re still stuck at the end, we’re happy to hop on a call to see how we can help out.
Labels aren't applied when merge conflicts occur
See original GitHub issueI think bors is supposed to apply S-waiting-on-author and remove S-waiting-on-review when merge conflicts occur, but it hasn’t been happening recently. See some examples here.
Issue Analytics
- State:
- Created 3 years ago
- Comments:5 (3 by maintainers)
Top Results From Across the Web
merge-conflicts label · Issue #26 · dwyl/labels - GitHub
when an event happens on a pull request (e.g. new commit pushed or assignment changed ... the merge-conflicts label should be applied and...
Read more >Git merge conflicts | Atlassian Git Tutorial
What is a git merge conflict? A merge conflict arises when Git cannot automatically resolve code differences between two commits. Learn more here....
Read more >Git shows no merge conflicts when it should - Stack Overflow
We just make a new tip commit, with its parent being the previous tip-most commit, and re-point the label, moving forward one step....
Read more >Merge Conflicts… WTH?!. Explain Git Branch Merges ...
Let us start with a few key concepts regarding branches & merges. They are my understanding so are not the canonical definitions :)...
Read more >How to Resolve a Merge Conflict When Using Git
A merge conflict happens when Git is unable to automatically resolve differences in code. This can be between two commits or branches.
Read more >
Top Related Medium Post
No results found
Top Related StackOverflow Question
No results found
Troubleshoot Live Code
Lightrun enables developers to add logs, metrics and snapshots to live code - no restarts or redeploys required.
Start Free
Top Related Reddit Thread
No results found
Top Related Hackernoon Post
No results found
Top Related Tweet
No results found
Top Related Dev.to Post
No results found
Top Related Hashnode Post
No results found
If significant changes need to be done due to rebase, which is a rare case, then the reviewer can ask to rebase.
I don’t think silently waiting for rebase is a behavior that should be encouraged in reviewers, since rebasing over small changes doesn’t affect reviewing at all. If rebase is wanted, then the reviewer can ask for it and change the label.
See this thread for more: https://rust-lang.zulipchat.com/#narrow/stream/242269-t-release.2Ftriage/topic/Label.20switching.20for.20outsiders.20is.20hard/near/209176797