Re: [fossil-users] backout a merge

2010-11-09 Thread Gé Weijers
After you merge in changes from a different branch, but before you check in the merge, is there any way to back out the merge? fossil revert undoes the changes but leaves the files edited, although with no changes. fossil undo type fossil help undo for an explanation Ge'

Re: [fossil-users] backout a merge

2010-11-08 Thread Lluís Batlle i Rossell
On Mon, Nov 08, 2010 at 11:05:14AM -0800, Jeff Rogers wrote: Hi all, After you merge in changes from a different branch, but before you check in the merge, is there any way to back out the merge? fossil revert undoes the changes but leaves the files edited, although with no changes.