Taragolis commented on code in PR #37886:
URL: https://github.com/apache/airflow/pull/37886#discussion_r1512515051


##########
airflow/providers/amazon/aws/hooks/s3.py:
##########
@@ -1369,10 +1362,6 @@ def download_file(
         """
         Download a file from the S3 location to the local file system.
 
-        Note:
-            This function shadows the 'download_file' method of S3 API, but it 
is not the same.
-            If you want to use the original method from S3 API, please use 
'S3Hook.get_conn().download_file()'
-

Review Comment:
   Just return in back. 
   
   Or if you use PyCharm: `Right Click On file -> Git -> Compare with branch 
... -> main` or `Right Click On file -> Git -> Compare with revision ... -> 
select revision which before you changes` and manually revert changes which you 
do not make on this PR. Same for 
https://github.com/apache/airflow/pull/37886#discussion_r1511795036
   
   It is the easiest way that I know in case if incidentally resolve conflicts
   
   
![image](https://github.com/apache/airflow/assets/3998685/1ae29e5c-5c9e-40ab-ba46-c1f191aaa231)
   
    
   
   



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to