You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
In the summary email it would be nice to notify if git had to fall back to 3-way merge, like here:
master@wireless-drivers-next > commit 2
Retrieving patches (1/1)
9007981 mwifiex: Drop unnecessary include pcieport_if.h
------------------------------------------------------------
1 patches
commit All/commit Individually/aBort? a
Applying: mwifiex: Drop unnecessary include pcieport_if.h
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/marvell/mwifiex/pcie.h
============================================================
1 patches applied:
30cfe9f61c2e mwifiex: Drop unnecessary include pcieport_if.h
Accept/request Changes/Reject/Show mail/Edit mail/aBort?
The text was updated successfully, but these errors were encountered:
In the summary email it would be nice to notify if git had to fall back to 3-way merge, like here:
The text was updated successfully, but these errors were encountered: