kicad-developers team mailing list archive

[Dick Hollenbeck <dick@xxxxxxxxxxx>]

On 04/03/2012 05:56 PM, Solonen Vesa wrote:
> It seems that the doc tree got a bit messed up after some divergence problems. I would most sincerely like to fix the branch to the same it was before the last push... I committed my changes to the local branch before syncing and got the divergence error on push. Sorted out the divergence by merge and commit to local branch and proceeded to push. In the end the diverged sections got merged back to the mainline as my changes. I expected the behavior to be something else by the docs [1]. I apologise for the inconvenience and stepping on toes and appreciate any help on sorting out the issue.
>
> -Vesa

push


is generally never to be used on a branch which is writable by more than one user.


quite possibly using push was one of your mistakes.


http://emacswiki.org/emacs/BzrForEmacsDevs