[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Denemo-devel] git merge master
|
From: |
Richard Shann |
|
Subject: |
Re: [Denemo-devel] git merge master |
|
Date: |
Fri, 06 Jan 2012 20:33:51 +0000 |
Oh - I see, I had to git pull in master first, then switch to soc.
I now have the merge.
Richard
On Fri, 2012-01-06 at 20:28 +0000, Richard Shann wrote:
> Jeremiah,
>
> When I do git merge master from inside the soc branch I get "Already
> up
> to date", which is not the case. Any ideas?
> Alternatively can you do it, and then I can just git pull from the soc
> branch.
>
> Richard