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 _______________________________________________ Denemo-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/denemo-devel
