These are chat archives for mansuleman/folks

28th
Sep 2014
Mansur S
@mansuleman
Sep 28 2014 21:47
folks
we can say when we push to repo
here
write test somebody
Akalamala
@Akalamala
Sep 28 2014 23:26
Hey, Vinay. Are you here?
vinayshankar
@vinayshankar
Sep 28 2014 23:26
hey
yeah
tell me
Akalamala
@Akalamala
Sep 28 2014 23:28
The repo is brocken
You checked in Folks.xccheckout file
*broken
vinayshankar
@vinayshankar
Sep 28 2014 23:29
yeah
what should i have done?
is it due to line endings?
we should not check in that file?
Akalamala
@Akalamala
Sep 28 2014 23:29
Yup
vinayshankar
@vinayshankar
Sep 28 2014 23:29
oh ok
will keep in mind
didnt know
Akalamala
@Akalamala
Sep 28 2014 23:29
Could you, please, do rollback now?
Monsieur knows how to do that
Mansur S
@mansuleman
Sep 28 2014 23:30
actually there is one file that can be removed
Folks.xccheckout
removed from git commit
and then pushed again
I had the same issue
error: The following untracked working tree files would be overwritten by merge:
Folks.xcodeproj/project.xcworkspace/xcshareddata/Folks.xccheckout
vinayshankar
@vinayshankar
Sep 28 2014 23:31
am not able to do that
not able to do the rollback
Mansur S
@mansuleman
Sep 28 2014 23:31
git rm Folks.xcodeproj/project.xcworkspace/xcshareddata/Folks.xccheckout
git commit -m 'removed scccheckout'
git push -u origin master
vinayshankar
@vinayshankar
Sep 28 2014 23:33
done