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
' [*Git Rebasing to Resolve Conflicts* by Drew Blessing](http://blessing.io/git/git-rebase/open-source/2015/08/23/git-rebasing-to-resolve-conflicts.html)'# noqa
876
877
' for a short tutorial.\n\n'
877
-
'Please avoid the ["**Resolve conflicts**" button](https://help.github.com/articles/resolving-a-merge-conflict-on-github/) on GitHub.'#noqa
878
-
' It uses `git merge` instead of `git rebase` which makes the PR commit'
878
+
'Please avoid the ["**Resolve conflicts**" button](https://help.github.com/articles/resolving-a-merge-conflict-on-github/) on GitHub.'#noqa
879
+
' It uses `git merge` instead of `git rebase` which makes the PR commit'# noqa
879
880
' history more difficult to read.\n\n'
880
881
'Sometimes step 4 will complete without asking for resolution. This is'
881
882
' usually due to difference between how `Cargo.lock` conflict is'
882
-
' handled during merge and rebase. This is normal, and you should still'
883
+
' handled during merge and rebase. This is normal, and you should still'# noqa
0 commit comments