Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
librbd: aio calls may block #4875
@dillaman would you mind adding an explanation of how you resolved the conflict at 9fa3039, adf7d70, 3e157fd, 24c0e08, 5331b2f ? I found that to be quite helpful. Of course the always is the possibility of comparing the diffs to see what have changed, but except for trivial conflicts knowing can help.
@dillaman if that's trivial I would just mention trivial rebase and the reader knows there is nothing to worry about in the conflict zone. e1d5773 has an example of non trivial resolution comment. c0cfd6e a comment that could have been trivial rebase but I started at the difference for a few minutes before seeing the ++ inversion so I felt the need to mention it ;-)