i'm doing git pull --rebase , conflict. after resolve conflict, git show me i'm in middle of merge. if doing simple merge, i'd add resolved files index , manual commit. since i'm rebasing how proceed have other commits applied after i've resolved conflict?
when used git pull --rebase , got conflicts, git displayed :
when have resolved problem, run "git rebase --continue".
if prefer skip patch, run "git rebase --skip" instead.
to check out original branch , stop rebasing, run "git rebase --abort".
in case, should use git rebase --continue
Comments
Post a Comment