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
First I tried to see the result of previous conflict resolution using [p], but it looked like result was not saved (I use e and a for each change). I edited conflict again, and then the green line appeared at the bottom. I edited one or more conflict before the crash happened.
I tried to rebase https://github.com/terraform-providers/terraform-provider-github/pull/96 on top of https://github.com/terraform-providers/terraform-provider-github/pull/108/files and got this.
First I tried to see the result of previous conflict resolution using
[p]
, but it looked like result was not saved (I usee
anda
for each change). I edited conflict again, and then the green line appeared at the bottom. I edited one or more conflict before the crash happened.The text was updated successfully, but these errors were encountered: