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: examples/java/src/main/java/
org/apache/beam/examples/common/WriteOneFilePerWindow.java
both modified: examples/java8/src/main/java/org/apache/beam/examples/
complete/game/utils/WriteToText.java
both modified: runners/core-construction-java/src/test/java/org/apache/
beam/runners/core/construction/WriteFilesTranslationTest.java
both modified: sdks/java/core/src/main/java/org/apache/beam/sdk/io/
DefaultFilenamePolicy.java
both modified: sdks/java/core/src/main/java/org/apache/beam/sdk/io/
FileBasedSink.java
both modified: sdks/java/core/src/main/java/org/apache/beam/sdk/io/TextIO.
java
both modified: sdks/java/core/src/main/java/org/apache/beam/sdk/io/
WriteFiles.java
both modified: sdks/java/core/src/main/java/org/apache/beam/sdk/values/
PCollectionViews.java
both modified: sdks/java/core/src/test/java/org/apache/beam/sdk/io/
AvroIOTest.java
both modified: sdks/java/core/src/test/java/org/apache/beam/sdk/io/
FileBasedSinkTest.java
both modified: sdks/java/core/src/test/java/org/apache/beam/sdk/io/
TextIOTest.java
both modified: sdks/java/core/src/test/java/org/apache/beam/sdk/io/
WriteFilesTest.java
both modified: sdks/java/harness/src/main/java/org/apache/beam/fn/
harness/control/ProcessBundleHandler.java
both modified: sdks/java/harness/src/test/java/org/apache/beam/fn/
harness/control/ProcessBundleHandlerTest.java
deleted by us: sdks/java/harness/src/test/java/org/apache/beam/runners/
core/BoundedSourceRunnerTest.java
both modified: sdks/java/io/google-cloud-platform/src/main/java/org/
apache/beam/sdk/io/gcp/datastore/DatastoreV1.java
both modified: sdks/java/io/google-cloud-platform/src/test/java/org/
apache/beam/sdk/io/gcp/datastore/DatastoreV1Test.java
On Wed, Jul 19, 2017 at 2:52 PM, Mingmin Xu <mingm...@gmail.com> wrote:
> Hi there,
>
> It seems branch DSL_SQL is broken after #3553
> <https://github.com/apache/beam/pull/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
> https://stackoverflow.com/questions/2389361/undo-a-git-merge
> -that-hasnt-been-pushed-yet/6217372#6217372
>
>
> I follow this way and here are the steps: (need to adjust target for real
> case)
> a. the revert PR https://github.com/XuMingmin/beam/pull/14;
> b. branch which has applied PR in a)
> https://github.com/XuMingmin/beam/tree/revert_3553_test;
> c. Now I can create a PR from XuMingmin/beam/revert_3553_test to
> apache/beam/master, see link
> <https://github.com/apache/beam/compare/master...XuMingmin:
> revert_3553_test?expand=1>
> ;
>
> 2. reverting a pull request in Github
> https://help.github.com/articles/reverting-a-pull-request/
> This is a feature in Github, I cannot see the '*revert*' button maybe
> because of permission.
>
> For both the two, I think #3553 need to redo in the end.
>
> Any suggestion which is the right way to go, or any other options?
>
> --
> ----
> Mingmin
>
