[
https://issues.apache.org/jira/browse/AIRFLOW-175?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15300241#comment-15300241
]
ASF subversion and git services commented on AIRFLOW-175:
---------------------------------------------------------
Commit 6d87679a56b7fd6f918439db953ca6b959752721 in incubator-airflow's branch
refs/heads/master from [~jlowin]
[ https://git-wip-us.apache.org/repos/asf?p=incubator-airflow.git;h=6d87679 ]
[AIRFLOW-175] Run git-reset before checkout in PR tool
If the user made any changes, git checkout will fail because the
changes would be overwritten. Running git reset blows the changes away.
> PR merge tool needs to reset environment after work_local finishes
> ------------------------------------------------------------------
>
> Key: AIRFLOW-175
> URL: https://issues.apache.org/jira/browse/AIRFLOW-175
> Project: Apache Airflow
> Issue Type: Bug
> Components: PR tool
> Affects Versions: Airflow 1.7.1.2
> Reporter: Jeremiah Lowin
> Assignee: Jeremiah Lowin
>
> If you use the pr tool to work locally ({{airflow-pr work_local}}) and make
> changes to the files, then an error is raised when you try to exit the PR
> tool because git refuses to overwrite the changes. The tool needs to call
> {{git reset --hard}} before exiting.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
