[
https://issues.apache.org/jira/browse/BEAM-4076?focusedWorklogId=116908&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-116908
]
ASF GitHub Bot logged work on BEAM-4076:
----------------------------------------
Author: ASF GitHub Bot
Created on: 28/Jun/18 17:05
Start Date: 28/Jun/18 17:05
Worklog Time Spent: 10m
Work Description: reuvenlax commented on issue #5545: [BEAM-4076] Import
Schema branch into master
URL: https://github.com/apache/beam/pull/5545#issuecomment-401105823
This command sequence doesn't actually work :)
git checkout --theirs --
fatal: '--ours/--theirs' cannot be used with switching branches
On Thu, Jun 28, 2018 at 9:24 AM Kenn Knowles <[email protected]>
wrote:
> We have turned on autoformatting of the codebase, which causes small
> conflicts across the board. You can probably safely rebase and just keep
> your changes. Like this:
>
> $ git rebase
> ... see some conflicts
> $ git diff
> ... confirmed that the conflicts are just autoformatting
> ... so we can just keep our changes are do our own autoformat
> $ git checkout --theirs --
> $ git add -u
> $ git rebase --continue
> $ ./gradlew spotlessJavaApply
>
> Please ping me if you run into any difficulty.
>
> —
> You are receiving this because you authored the thread.
> Reply to this email directly, view it on GitHub
> <https://github.com/apache/beam/pull/5545#issuecomment-401092921>, or mute
> the thread
>
<https://github.com/notifications/unsubscribe-auth/AUGE1ccwvUwiu5qovwBzcLVctY3A-2W7ks5uBQMdgaJpZM4UYOHO>
> .
>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 116908)
Time Spent: 3h 50m (was: 3h 40m)
> Schema followups
> ----------------
>
> Key: BEAM-4076
> URL: https://issues.apache.org/jira/browse/BEAM-4076
> Project: Beam
> Issue Type: Improvement
> Components: beam-model, dsl-sql, sdk-java-core
> Reporter: Kenneth Knowles
> Priority: Major
> Time Spent: 3h 50m
> Remaining Estimate: 0h
>
> This umbrella bug contains subtasks with followups for Beam schemas, which
> were moved from SQL to the core Java SDK and made to be type-name-based
> rather than coder based.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
