i made mistake in pull request , created conflict in 1 of files. rather follow github's instructions hand-merging we'd still via github ui. keeps our review workflow consistent way.
what i'd try rebasing branch against master, force pushing changes branch on fork (no one's touched except me) i'm little new rebasing , not sure how go it.
essentially, have branch my_branch on my_fork want origin master. pull request my_branch\my_fork has conflict (i know trouble is) that's preventing merging.
what don't know how rebase branch against master, happens when reach commit conflict, after solve conflict (isn't there rebase continue option?) step steps appreciated.
since have pushed branch want merge, can mess around rebase , start on again if mess up. also, can try merging branch master branch locally, , if works reset local master branch 1 commit , push feature branch , same merge on github.
when rebase, if there no conflict rebase completes fully. if there conflict, can either continue or abort. continue resolve conflicts, add files index , continue, same merge. solve next conflict same way if there any.
so this:
git checkout my_branch git rebase master # conflict happens here, resolved in preferred way git add -a git rebase --continue 
Comments
Post a Comment