try to use '*git clean -f <file>*' to remove the untracked files from your repository
On Mon, Jun 1, 2009 at 10:15 AM, Richard Livsey <[email protected]> wrote: > > Hi, not directly a GitHub issue, but I'm running into problems > merging/rebasing a branch. > > It looks like a file has been deleted/renamed in master and that's > causing issues when merging it into the old branch. > I'm getting "Untracked working tree file xxx would be overwritten by > merge". > > The following is the output I get: > http://gist.github.com/121430 > > ~/Sites/fortaleza[master]$ git checkout vcgames-list-all-games-page > error: Untracked working tree file > 'public/flash/games/vcgames/PinBall/PinBallLogo.swf' would be > overwritten by merge. > ~/Sites/fortaleza[master]$ rm > public/flash/games/vcgames/PinBall/PinBallLogo.swf > ~/Sites/fortaleza[master*]$ git checkout vcgames-list-all-games-page > Switched to branch 'vcgames-list-all-games-page' > ~/Sites/fortaleza[vcgames-list-all-games-page]$ git rebase master > First, rewinding head to replay your work on top of it... > error: Untracked working tree file > 'public/flash/games/vcgames/PinBall/PinballLogo.swf' would be > overwritten by merge. > could not detach HEAD > ~/Sites/fortaleza[vcgames-list-all-games-page]$ mv > public/flash/games/vcgames/PinBall/PinBallLogo.swf > public/flash/games/vcgames/PinBall/PinballLogo.swf > ~/Sites/fortaleza[vcgames-list-all-games-page*]$ git rebase master > First, rewinding head to replay your work on top of it... > error: Untracked working tree file > 'public/flash/games/vcgames/PinBall/PinballLogo.swf' would be > overwritten by merge. > could not detach HEAD > ~/Sites/fortaleza[vcgames-list-all-games-page*]$ rm > public/flash/games/vcgames/PinBall/PinBallLogo.swf > ~/Sites/fortaleza[vcgames-list-all-games-page*]$ git rebase master > public/flash/games/vcgames/PinBall/PinBallLogo.swf: needs update > cannot rebase: you have unstaged changes > ~/Sites/fortaleza[vcgames-list-all-games-page*]$ > > Anyone have any ideas how I get the working copy into a state that it > can safely be merged? > > Thanks. > > -- > Richard Livsey > Minutebase - Online Meeting Minutes > http://minutebase.com > http://livsey.org > > > > --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "GitHub" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/github?hl=en -~----------~----~----~----~------~----~------~--~---
