Re: [MSEide-MSEgui-talk] Git merge

2012-02-18 Thread Martin Schreiber
Am 18.02.2012 22:02, schrieb Graeme Geldenhuys: > On 18 February 2012 15:35, Martin Schreiber wrote: >> >> That was an accident which probably would not happen with SVN. ;-) > > :-) > If it was an accident, when why didn't you roll back the merge? A 'git > reset' should have done the trick. After

Re: [MSEide-MSEgui-talk] Git merge

2012-02-18 Thread Graeme Geldenhuys
On 18 February 2012 15:35, Martin Schreiber wrote: > > That was an accident which probably wold not happen with SVN. ;-) :-) If it was an accident, when why didn't you roll back the merge? A 'git reset' should have done the trick. After all, all changes in git happen locally first (which can all

Re: [MSEide-MSEgui-talk] Git merge

2012-02-18 Thread Martin Schreiber
Graeme Geldenhuys wrote: > Hi Martin, > > I see you have been pretty busy. A nice Octopus Merge - try that with SVN! > :-) > That was an accident which probably wold not happen with SVN. ;-) Martin -- Virtualization &

[MSEide-MSEgui-talk] Git merge

2012-02-18 Thread Graeme Geldenhuys
Hi Martin, I see you have been pretty busy. A nice Octopus Merge - try that with SVN! :-) -- Regards,   - Graeme - ___ fpGUI - a cross-platform Free Pascal GUI toolkit http://fpgui.sourceforge.net <>--