[Bug 4741] bzr shelve is confusing to me

[James Blackwell]

On Wed, Nov 30, 2005 at 08:52:23AM +0100, Jan Hudec wrote:
> > I know that its not quite the answer you're looking for, but there is
> > another behaviour that you can perform that will also minimize conflict
> > pain:
> > 
> > $ bzr branch url code
> > $ hack, hack, hack commit
> > $ bzr merge
> $ bzr commit
> > $ hack, hack, hack commit
> > $ bzr merge
> $ bzr commit
> > $ hack, hack, hack, sleep
> > $ # Good morning
> > $ bzr st; bzr diff
> > $ commit
> > $ bzr merge
> $ bzr commit
> > $ hack, hack, hack commit
> > $ merge request
> 
> ... you should commit after a merge before hacking on.

Those were conflicted merges! :P

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051130/f58c132e/attachment.pgp