Skip to content

resolving conflicts from master#3691

Merged
ytaous merged 4 commits intoort_training_for_merge_to_masterfrom
ettao/conflicts
Apr 24, 2020
Merged

resolving conflicts from master#3691
ytaous merged 4 commits intoort_training_for_merge_to_masterfrom
ettao/conflicts

Conversation

@ytaous
Copy link
Copy Markdown
Contributor

@ytaous ytaous commented Apr 24, 2020

Description: resolving conflicts before merge back to master

Motivation and Context

  • as titled

@ytaous ytaous added the training issues related to ONNX Runtime training; typically submitted using template label Apr 24, 2020
@ytaous ytaous requested a review from edgchen1 April 24, 2020 19:16
@ytaous ytaous requested a review from a team as a code owner April 24, 2020 19:16
@ytaous ytaous requested a review from SherlockNoMad April 24, 2020 19:41
Comment thread tools/ci_build/build.py Outdated
Comment thread tools/ci_build/build.py Outdated
Comment thread tools/ci_build/build.py Outdated
Comment thread tools/ci_build/build.py Outdated
Comment thread tools/ci_build/build.py Outdated
Comment thread tools/ci_build/build.py Outdated
@ytaous ytaous requested a review from edgchen1 April 24, 2020 21:30
@ytaous ytaous merged commit c38a60a into ort_training_for_merge_to_master Apr 24, 2020
@ytaous ytaous deleted the ettao/conflicts branch April 24, 2020 21:38
edgchen1 added a commit that referenced this pull request Apr 24, 2020
edgchen1 added a commit that referenced this pull request Apr 24, 2020
@edgchen1 edgchen1 restored the ettao/conflicts branch April 24, 2020 21:49
@ytaous ytaous deleted the ettao/conflicts branch April 24, 2020 22:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

training issues related to ONNX Runtime training; typically submitted using template

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants