Re: [fossil-users] update vs checkout

2016-05-01 Thread Joerg Sonnenberger
On Sat, Apr 30, 2016 at 11:30:08PM -0600, Scott Robison wrote: > Note that you have to merge mybranch back to trunk, otherwise all the > changes made in mybranch will live happily over there forever. Once you > updated to trunk, you abandoned all committed work from the other branch. You can also

Re: [fossil-users] update vs checkout

2016-05-01 Thread Richard Hipp
On 4/30/16, Steve Schow wrote: > > So both merge and update merge into the checked out workspace, they do not > merge into a branch in the repo under any circumstances? > Yes. This is an important point. The "commit" command makes changes to the repository. The "update",