> So you must have locally committed a modified "ccdpack/component.xml" before
> doing the rebase. Your modification would then be retained and pushed to the
> head of the trunk.
I did the rebase, then the make world, which failed because of mag. I
reconfigured and restarted make world. atools failed because of psx, so
rebuilt psx manually, and then resumed make world again. When make
world had completed I found the modified component.xml, checked the
differences, committed it. It wouldn't have been the first time I
committed somebody else's forgotten component.xml. (I must remind
myself why this _built_ file is in the repository.) Now I think I also
did a git stash and a later pull, as you suggest. Also your commit
might have been around the time of the first pull.
Note I've not been using git for a while and hadn't been able to update
let alone rebuild. I've had issues before following a long hiatus
between pulls.
Malcolm
|