[Kde-games-devel] Trouble with branch KDE/4.12

[Ian Wadham]

On 30/12/2013, at 2:26 AM, Albert Astals Cid wrote:
> El Diumenge, 29 de desembre de 2013, a les 13:37:06, Ian Wadham va escriure:
>> I really want to avoid having the "merge from 4.12" history and my own
>> local master history both appearing on the central repository.
> 
> If you want to kill everything you had (i.e. "re-synchronise my local master 
> with KDE master") you have to do
> 
> Note that this will *delete* and *vanish* any of the changes you had
> git checkout master            <-- make sure you're in the local master branch
> git reset --hard origin/master <-- reset the local master to the remote master

Thanks again, Albert. That worked fine and I now have a clean history on
which to develop Palapeli further.

I have also completed the final stage of merging the Palapeli Restart-bug
fix into 4.11, 4.12 and origin master (ready for 4.13).

All the best, Ian W.