Rebase 실패 로그 - Githubissues

ucrystal commented 9 years ago

C:\Git\bin\git.exe pull --rebase --progress "origin" remote: Total 21 (delta 11), reused 17 (delta 7) From github.com:Jishong/LIS dee2f4d..d179972 master -> origin/master

[new branch] jisoo -> origin/jisoo First, rewinding head to replay your work on top of it... error: unable to unlink old 'LibraryInformationSystem/LibraryInformationSystem.sdf' (Permission denied) Applying: push to make up-to-date version Using index info to reconstruct a base tree... M LibraryInformationSystem/LibraryInformationSystem.sdf Falling back to patching base and 3-way merge... error: Your local changes to the following files would be overwritten by merge: LibraryInformationSystem/LibraryInformationSystem.sdf Please, commit your changes or stash them before you can merge. Aborting Failed to merge in the changes. Patch failed at 0001 push to make up-to-date version The copy of the patch that failed is found in: c:/SE2014Git/LIS/.git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue". If you prefer to skip this patch, run "git rebase --skip" instead. To check out the original branch and stop rebasing, run "git rebase --abort".

Done

ucrystal commented 9 years ago

아 헐 지금보니 jisoo브랜치가 uptodate가 아니란건가...?

HwangSue commented 9 years ago

LibraryInformationSystem/LibraryInformationSystem.sdf 이 소스만 문제 있는거 아니야?ㅠㅠ

Jishong commented 9 years ago

Your local changes to the following files would be overwritten by merge: LibraryInformationSystem/LibraryInformationSystem.sdf Please, commit your changes or stash them before you can merge.

니까 sdf commit해주면 될듯?

Jishong / LIS

Rebase 실패 로그 #10