| --- Log opened Wed May 04 00:00:43 2011 | ||
| -!- ameerkat [~ameerkat@184-98-140-155.phnx.qwest.net] has joined #shogun | 01:26 | |
| -!- blackburn [~qdrgsm@188.168.2.173] has left #shogun [] | 01:42 | |
| -!- ameerkat [~ameerkat@184-98-140-155.phnx.qwest.net] has quit [Ping timeout: 276 seconds] | 02:03 | |
| -!- ameerkat [~ameerkat@184-98-140-155.phnx.qwest.net] has joined #shogun | 04:42 | |
| -!- alesis-novik [~alesis@188.74.87.84] has joined #shogun | 06:05 | |
| -!- sploving [~root@124.16.139.196] has joined #shogun | 09:24 | |
| sploving | hello all | 09:24 |
|---|---|---|
| -!- blackburn [~qdrgsm@188.168.4.214] has joined #shogun | 09:44 | |
| sploving | hell blackburn | 09:51 |
| blackburn | hell? :D | 09:51 |
| sploving | my git met a mess problem | 09:51 |
| blackburn | what kind of? | 09:52 |
| sploving | To git@github.com:sploving/shogun.git | 09:52 |
| sploving | ! [rejected] master -> master (non-fast forward) | 09:52 |
| sploving | have you met this problem | 09:52 |
| blackburn | hmm | 09:52 |
| sploving | I commit a patch, but found not well. then I tried to use git commit --amend | 09:53 |
| sploving | and git push | 09:53 |
| sploving | it shows the above error | 09:53 |
| sploving | I spent almost a whole afternoon:( | 09:53 |
| blackburn | sploving: did you tried to git pull before? | 09:54 |
| sploving | blackburn, I tried. it said,Auto-merged src/java_modular/shogun/examples/VectorTest.java | 09:55 |
| sploving | CONFLICT (content): merge conflict in src/java_modular/shogun/examples/VectorTest.java | 09:55 |
| blackburn | hmm | 09:55 |
| sploving | blackburn, do you know who are responsible for the github when sonney2k is away/ | 09:56 |
| blackburn | sploving: I think no one :) | 09:56 |
| sploving | blackburn, then how to commit? | 09:56 |
| blackburn | sploving: I think we have to wait a little | 09:56 |
| sploving | blackburn, could I re fork? | 09:57 |
| blackburn | sploving: just do a pull request if you want | 09:57 |
| blackburn | sploving: copy-paste your git status somewhere | 09:57 |
| blackburn | e.g. pastebin or etc | 09:57 |
| sploving | git pull "You are in the middle of a conflicted merge" | 09:59 |
| blackburn | ok, we should resolve that conflict | 10:00 |
| blackburn | sploving: please 'git status' and paste it somewher | 10:00 |
| sploving | blackburn,ok | 10:01 |
| blackburn | sploving: btw it is your fork, right? | 10:02 |
| sploving | yep | 10:02 |
| sploving | do you have another quick way to refork my branch? | 10:02 |
| blackburn | what do you mean saying refork? | 10:02 |
| sploving | I mean redownload my branch | 10:03 |
| blackburn | just 'git clone' it again if you want | 10:04 |
| blackburn | in some other dir | 10:04 |
| blackburn | btw why you did git commit --amend? | 10:04 |
| sploving | blackburn, my commit is not perfect | 10:05 |
| blackburn | ah | 10:05 |
| sploving | I mean i lost some file | 10:05 |
| blackburn | sploving: just paste git status, may be I will see something and could help you | 10:06 |
| sploving | blackburn,http://pastebin.com/tyheU7M9 | 10:07 |
| blackburn | aha I see | 10:08 |
| blackburn | sploving: you can see you have 2 files unmerged and modified | 10:08 |
| sploving | yep | 10:08 |
| sploving | blackburn, then how to update? | 10:09 |
| blackburn | try to git add src/java_modular/build.xml | 10:09 |
| blackburn | and git add src/java_modular/shogun/examples/VectorTest.java | 10:09 |
| blackburn | then git status and take a look if it is changed | 10:10 |
| blackburn | or you can git merge master | 10:11 |
| blackburn | I really don't know why you have had a conflict | 10:11 |
| blackburn | did somebody changed files you work with? | 10:11 |
| blackburn | sploving: so what's up? | 10:13 |
| blackburn | sploving: if you will have this problem just do 'git reset --merge' | 10:13 |
| blackburn | after that you will be able to git pull and all the things | 10:13 |
| sploving | blackburn, git reset will make my new file lose? | 10:15 |
| blackburn | sploving: yeap, just save it somewhere, then git reset, then replace it again and git commit | 10:16 |
| sploving | blackburn, git reset HEAD? | 10:16 |
| blackburn | you can try it too, but 'git reset --merge' could resolve your unmerged files | 10:17 |
| sploving | blackburn, I will have a try | 10:17 |
| blackburn | sploving: why you have such conflict? | 10:18 |
| blackburn | I mean was it changed somewhere outside your fork? | 10:18 |
| sploving | no. maybe I used git revert | 10:19 |
| sploving | blackburn, are you sure git reset --merege? | 10:19 |
| sploving | usage: git-reset [--mixed | --soft | --hard] [-q] [<commit-ish>] [ [--] <paths>...] | 10:19 |
| sploving | it saids above | 10:20 |
| blackburn | hm | 10:20 |
| blackburn | sploving: git merge master | 10:20 |
| sploving | Already up-to-date | 10:21 |
| blackburn | sploving: are these unmerged files in git status? | 10:21 |
| sploving | blackburn, yeap | 10:23 |
| blackburn | sploving: did you saved that files? | 10:24 |
| blackburn | sploving: if so just try to git reset --hard HEAD | 10:24 |
| blackburn | the simpliest way I think | 10:24 |
| sploving | that works | 10:25 |
| blackburn | sploving: so just replace files by new ones and then commit and push, I think it will work too | 10:26 |
| blackburn | I hadn't any experience of such conflicts resolving | 10:27 |
| sploving | yeap. I will have a try | 10:28 |
| -!- heiko [~heiko@infole-06.uni-duisburg.de] has joined #shogun | 10:34 | |
| blackburn | have to go now, see ya | 10:34 |
| -!- blackburn [~qdrgsm@188.168.4.214] has quit [Quit: Leaving.] | 10:34 | |
| -!- heiko [~heiko@infole-06.uni-duisburg.de] has quit [Quit: Leaving.] | 12:07 | |
| -!- ameerkat [~ameerkat@184-98-140-155.phnx.qwest.net] has quit [Ping timeout: 276 seconds] | 13:22 | |
| -!- blackburn [~qdrgsm@188.168.2.211] has joined #shogun | 17:02 | |
| -!- ameerkat [~ameerkat@184-98-140-155.phnx.qwest.net] has joined #shogun | 18:58 | |
| -!- heiko [~heiko@infole-06.uni-duisburg.de] has joined #shogun | 21:13 | |
| -!- heiko [~heiko@infole-06.uni-duisburg.de] has left #shogun [] | 23:18 | |
| --- Log closed Thu May 05 00:00:44 2011 | ||
Generated by irclog2html.py 2.10.0 by Marius Gedminas - find it at mg.pov.lt!