Re: [NEED HELP] how to revert a PR in branch DSL_SQL

2017-07-20 Thread Mingmin Xu
Thanks @Kenn, awesome explanation! Following option (1) now. On Thu, Jul 20, 2017 at 10:14 AM, Kenneth Knowles wrote: > On Wed, Jul 19, 2017 at 9:35 PM, Mingmin Xu wrote: > > > Merge with conflict is not a good choice to me either as lots of files

Re: [NEED HELP] how to revert a PR in branch DSL_SQL

2017-07-19 Thread Kai Jiang
Or another option is solve merge conflict. This might not be the best way. Because once master branch has some changes, we still need to do this same way. I tried merge locally. We could solve conflict files and open PR for that. conflict files are: both modified:

[NEED HELP] how to revert a PR in branch DSL_SQL

2017-07-19 Thread Mingmin Xu
Hi there, It seems branch DSL_SQL is broken after #3553 , as I cannot create a PR to master branch with error message '*Can’t automatically merge.*'. Googled and find two solutions: 1. submit a revert PR with Git