[
https://issues.apache.org/jira/browse/HIVE-16501?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15995496#comment-15995496
]
Zoltan Haindrich commented on HIVE-16501:
-----------------------------------------
[~ekoifman] if you haven't added a file to git...the code will just compile
fine...and since the worktree might have already crowded with crappy files...it
will even pass the compile test..you suggest to set gitignore for myself...but
that doesn't really address the original issue...anyway: If you would like to
revert this change...I'm not against it - but this .orig and .rej files will
come back later again...
I've played with it a bit...and it seems the following might come handy;
setting {{--index}} for git apply makes it apply the patch directly to the git
index - and it seems very usefull:
{code}
git apply --index HIVE-15224.3-branch-1.patch
# or enable git level conflic markers; this will appear as like a regular merge
problem - but marked at the git level as well
git apply -3 p0.patch
{code}
both of these will never miss an added file...and {{-3}} will mark it as a
conflicted file ; and since this is now git merge conflict; {{git mergetool}}
can be used to resolve the conflict...
> 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)
