[ 
https://issues.apache.org/jira/browse/HIVE-16501?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16003817#comment-16003817
 ] 

Wei Zheng commented on HIVE-16501:
----------------------------------

I also just realized this change.. I applied a patch which resulted in many 
conflicts, and wanted to see which failed in order to resolve those conflicts. 
But I didn't see the .orig and .rej files, which made it hard for me to 
proceed. I agree with Eugene that this change is not necessary and will cause 
inconvenience to the development.

> Add rej/orig to .gitignore ; remove *.orig files
> ------------------------------------------------
>
>                 Key: HIVE-16501
>                 URL: https://issues.apache.org/jira/browse/HIVE-16501
>             Project: Hive
>          Issue Type: Improvement
>            Reporter: Zoltan Haindrich
>            Assignee: Zoltan Haindrich
>             Fix For: 3.0.0
>
>         Attachments: HIVE-16501.1.patch
>
>
> sometimes git reject/orig files made there way into the repo...
> it would be better to just ignore them :)



--
This message was sent by Atlassian JIRA
(v6.3.15#6346)

Reply via email to