I sometimes forget that I perceive time on a different scale to you mortals.
On 28 April 2011 15:43, Nico Kadel-Garcia wrote:
> On Wed, Apr 27, 2011 at 8:38 PM, Ben Carbery
> wrote:
> > Ok running 1.6 now and repository upgraded. Must have been a recent RH
> > patch?
>
since
there were no changes in the branch I needed to keep (except the ones that
should have been in trunk).
Thanks all, guess I avoid having to learn merge for another day.
On 27 April 2011 23:11, Ulrich Eckhardt wrote:
> On Wednesday 27 April 2011, Ben Carbery wrote:
> > I h
it though, I'll have another attempt.
On Wed, Apr 27, 2011 at 8:14 PM, Prabhu Gnana Sundar wrote:
> On Wednesday 27 April 2011 03:27 PM, Ben Carbery wrote:
>
>> Hi,
>> I am fairly new to version control, and have made what is probably a
>> newbie mistake.
>> I
Hi,
I am fairly new to version control, and have made what is probably a
newbie mistake.
I created a branch and switched to it. Later I committed changes that
were meant for trunk, forgetting that I had switched to the branch. So
I want to undo this, without losing the changes..
What is the correct
