kicad-developers team mailing list archive
Mailing list archive
Re: bzr problem
On Wed, 14 Apr 2010, Milan Horák wrote:
trying to 'bzr merge', but it writes
bzr: ERROR: Working tree "/home/mhorak/bzr/kicad/" has uncommitted changes
(See bzr status).
'bzr status' reports
pending merge tips: (use -v to see all merge revisions)
jean-pierre charras 2010-04-13 fixed 2 minor bugs
Am I doing something wrong?
You have to locally commit (or shelve I think) your changes before
merging from upstream. At least, that's how resolved it:P