| val (recycleQueue, recycleSource) = | |
| Source | |
| .queue[SoilStateReading](100, OverflowStrategy.dropTail) | |
| .prefixAndTail(0) | |
| .map(_._2) | |
| .toMat(Sink.head)(Keep.both) | |
| .run() | |
| StreamConverters.fromInputStream(() => this.getClass.getClassLoader.getResourceAsStream("sensors.log")) | |
| .via(SoilStateReading.csvParser) | |
| .merge(Source.fromFutureSource(recycleSource)) |
| SPC s c remove highlight | |
| **** Files manipulations key bindings | |
| Files manipulation commands (start with ~f~): | |
| | Key Binding | Description | | |
| |-------------+----------------------------------------------------------------| | |
| | ~SPC f c~ | copy current file to a different location | | |
| | ~SPC f C d~ | convert file from unix to dos encoding | | |
| | ~SPC f C u~ | convert file from dos to unix encoding | |
| // simple example of the cake pattern | |
| // abstract DAO trait | |
| trait Repository[A, B]{ | |
| // saves an entity, returns an ID | |
| def save(entity: A): B | |
| // more features.. | |
| } | |
| trait RdbmsRepository extends Repository[MyUserCaseClass, Long]{ |
Use magit-ediff or 'e' on an unmerged item to resolve merge conflicts with ediff. Magit will set up an ediff with three buffers A, B and C. A and B are the original (conflicting) files, and C is the conflicted merge.
Use 'n'/'p' to move to the next/previous conflict, use 'a'/'b' to choose which changes (those in a A or B) should be the ones to keep in the merged file.
You can always just switch to buffer C and edit what the merged version should look like.
