| Workflow for Gerrit Code reviews in Platform UI [message #1708849] |
Mon, 21 September 2015 20:42  |
 Patrik Suzzi
Messages: 2
Registered: February 2018 |
Junior Member |
|
|
Hallo,
I am a contributor and sometimes I push some Platform UI commits to Gerrit.
Unfortunately, sometime happens that a commit gets stuck into a "Cannot Merge" deadly loop.
Tipically the loop starts with this "Cannot merge" signal into my gerrit Change review page.
Then, if no committer is actively looking at this, typically, the commits ends up to be one of the many commits in "Merge Conflict", that makes me feel guilty!
I am really curious to know what the Eclipsetiquette is suggesting in this case.
In particular, in my case, I have two questions to understand "how it works":
- Which action should I take when my change is in "Merge Conflict"?
- How can I check if other committers are willing to merge my change, without being too pushy?
Thank you for the time you're dedicating here.
With Respect
|
|
|
| Re: Workflow for Gerrit Code reviews in Platform UI [message #1708851 is a reply to message #1708849] |
Mon, 21 September 2015 21:04  |
Eclipse User |
|
|
|
That means that the HEAD has moved on (other commits have been made) so your proposal cannot be merged as-is. Don't worry: we'll normally rebase or cherry-pick it to HEAD before submitting.
Really the best way to get your changes committed is to make sure you explain why the changes were necessary, along with potential interactions. Either annotate the code with good comments, or add them as a self-review on Gerrit. It takes work to do, but it's the time a committer is going to have to spend to understand your change. It shows you understand the code. That's my opinion, at least.
Brian.
|
|
|
Powered by
FUDForum. Page generated in 0.03544 seconds
] 
Search
Help
Register
Login
Home
