| # |
Jul 31st 2009, 15:59 |
jperras |
that's just a stash that you made |
| # |
Jul 31st 2009, 15:59 |
jperras |
that |
| # |
Jul 31st 2009, 15:59 |
jperras |
hey |
| # |
Jul 31st 2009, 15:56 |
alkemann |
git problem http://imagebin.ca/img/XgT6eM.gif |
| # |
Jul 31st 2009, 15:55 |
alkemann |
jperras: alive? |
| # |
Jul 31st 2009, 10:01 |
alkemann |
sigh.. cant figure this out now. i gotta head out. laters |
| # |
Jul 31st 2009, 10:00 |
alkemann |
tried ti cherry pick the 2.0 commit into the userplugin comtti and got conflict.. |
| # |
Jul 31st 2009, 09:56 |
alkemann |
i am looking at the gitk visualization. but .. |
| # |
Jul 31st 2009, 09:55 |
jperras |
a graphical viewer does help, you just need to get used to it |
| # |
Jul 31st 2009, 09:54 |
jperras |
well, svn has merge commits as well |
| # |
Jul 31st 2009, 09:54 |
alkemann |
the difference between my local 2.0 and the remote 2.0 is 4 commits and 4 merges. not in order |
| # |
Jul 31st 2009, 09:53 |
alkemann |
these merge commits gives me troubles.. i know ther suppose to help, but tbh it does |
| # |
Jul 31st 2009, 09:52 |
jperras |
no graph for you |
| # |
Jul 31st 2009, 09:52 |
jperras |
ah, oh well |
| # |
Jul 31st 2009, 09:52 |
alkemann |
1.6.1.9 |
| # |
Jul 31st 2009, 09:51 |
jperras |
if you have git 1.6.3, try a git log --graph |
| # |
Jul 31st 2009, 09:51 |
jperras |
haha |
| # |
Jul 31st 2009, 09:51 |
alkemann |
jperras: these gitk lines looks like a subway system made by a blind man.. not sure it helps alot heh |
| # |
Jul 31st 2009, 09:50 |
alkemann |
indeed u had better |
| # |
Jul 31st 2009, 09:50 |
jperras |
P |
| # |
Jul 31st 2009, 09:50 |
jperras |
25? oy. Guess I better get crackin' |
| # |
Jul 31st 2009, 09:50 |
jperras |
and then run a git revert on the hash you want to get rid of |
| # |
Jul 31st 2009, 09:50 |
jperras |
so cherry-pick the commit from one to the other |
| # |
Jul 31st 2009, 09:49 |
alkemann |
jperras: and 25 in pending ;) |
| # |
Jul 31st 2009, 09:48 |
alkemann |
the merge of 2.0 into 2.0 doesnt sound like it does anything usefull anyways |
| # |
Jul 31st 2009, 09:47 |
jperras |
and then change 2.0 so that the commits are reversed |
| # |
Jul 31st 2009, 09:47 |
jperras |
well, you can cherry-pick the commits from 2.0 to usersplugin |
| # |
Jul 31st 2009, 09:47 |
alkemann |
removed developer Write permission to 2.0 brannch then |
| # |
Jul 31st 2009, 09:47 |
jperras |
ok |
| # |
Jul 31st 2009, 09:46 |
alkemann |
yea |
| # |
Jul 31st 2009, 09:46 |
jperras |
so the two commits to 2.0 need to be moved to the usersplugin? |
| # |
Jul 31st 2009, 09:46 |
jperras |
ok |
| # |
Jul 31st 2009, 09:45 |
alkemann |
he is only suppose to work on the usersplugin branch |
| # |
Jul 31st 2009, 09:45 |
alkemann |
yea |
| # |
Jul 31st 2009, 09:45 |
jperras |
so those should have been in the usersplugin branch instead? |
| # |
Jul 31st 2009, 09:44 |
alkemann |
yea two commits from him in the 2.0 branch |
| # |
Jul 31st 2009, 09:44 |
jperras |
he pushed it to the usersplugin branch |
| # |
Jul 31st 2009, 09:43 |
alkemann |
havnt pulled on this computer. ill check |
| # |
Jul 31st 2009, 09:42 |
jperras |
what does gitx/git log say? |
| # |
Jul 31st 2009, 09:42 |
alkemann |
timeline seems to say he pushed to wrong branch |
| # |
Jul 31st 2009, 09:42 |
jperras |
what happened? |
