Hi Cody,
I got a fresh copy of pantheon-files, removed branches for bugs 998555 and 995762 and committed the changes again.
I hope there will be no problems merging the branches now.
Remember that 995762 has new files for the "cserver" plugin at:
pantheon-files-fix-995762/plugins/marlin-cserver/
I added these files with "bzr add plugins/marlin-cserver/*"
Hi Cody,
I got a fresh copy of pantheon-files, removed branches for bugs 998555 and 995762 and committed the changes again.
I hope there will be no problems merging the branches now.
Remember that 995762 has new files for the "cserver" plugin at:
pantheon- files-fix- 995762/ plugins/ marlin- cserver/
I added these files with "bzr add plugins/ marlin- cserver/ *"