[
https://issues.apache.org/jira/browse/HIVE-16501?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15995038#comment-15995038
]
Eugene Koifman edited comment on HIVE-16501 at 5/3/17 3:12 PM:
---------------------------------------------------------------
I think checking in badly merged files is much worse than checking in .rej
files.
While everyone should compile before checking in we all know that doesn't
always happen.
Maybe not using "git add ." to blindly add everything is safer. For example
"git add -u" followed by a conscious review of the new files you are adding?
BTW, git does tell you about these files (and so does IntelliJ) unless they are
in .gitignore
was (Author: ekoifman):
I think checking in badly merged files is much worse than checking in .rej
files.
While everyone should compile before checking in we all know that doesn't
always happen.
Maybe not using "git add ." to blindly add everything is safer. For example
"git add -u" followed by a conscious review of the new files you are adding?
> 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)
