Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

untracked files interfere with merge from master #2164

Closed
tbrowder opened this issue Aug 1, 2018 · 2 comments
Closed

untracked files interfere with merge from master #2164

tbrowder opened this issue Aug 1, 2018 · 2 comments

Comments

@tbrowder
Copy link
Member

tbrowder commented Aug 1, 2018 •
edited

When I tried to update from master, I got this error from git:

error: The following untracked working tree files would be overwritten by merge:
tools/build/makeMAGIC_INC_DEC.p6
tools/build/makeNATIVE_ARRAY.p6
tools/build/makeNATIVE_SHAPED_ARRAY.p6
tools/build/makeSLICE.p6

The Makefile target distclean should remove those files unless they are intended to be version controlled, or may .gitignore them.
@zoffixznet
Copy link
Contributor

These files are tracked on master: https://github.com/rakudo/rakudo/tree/master/tools/build

There was a recent rename of them tho.

@tbrowder
Copy link
Member Author

tbrowder commented Aug 1, 2018

Thanks, closing.

@tbrowder tbrowder closed this as completed Aug 1, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@tbrowder @zoffixznet