Why is my Git Merge Greyed Out ?
I did a Git merge, but now that merge is greyed out inside the Git Log When I click on the diff for the web.php file there are differences. However it is unclear how to resolve those differences, even if they are responsible for the greyed out. What am I missing? Please see the three images below. Many Thanks!
请先登录再写评论。
Merge commits are greyed out in order to prevent distraction.
As for the merge window - it's not a conflict resolution window but rather convenient representation of a merge commit