bzr bazaar graphical merge (kdiff3)

Um mit Bazaar unter Windows ein Merge-Tool zu benutzen:

install extmerge plugin:
bzr branch lp:bzr-extmerge extmerge

merge plugin config
C:\Programme\KDiff3\kdiff3.exe %t %o  -o %r -b %b -m -L1 BASE -L2 local-version -L3 server-version

merge
>bzr emerge readme.txt
>bzr resolved readme.txt
>bzr commit


Kommentare

Kommentar veröffentlichen

Beliebte Posts aus diesem Blog

using the birt runtime with spring boot and gradle to generate PDF from a Report Design File

Warning: at the moment not recommended as solution. Personal Note (too complicated to keep in my brain / transient memory) birt simply does not think in this way: push data into report vs pull datasource, osgi vs. maven, design time jars.... Step 1: use with gradle: get dependencies from maven repo: compile ( group : 'org.eclipse.birt.runtime' , name : 'org.eclipse.birt.runtime' , version : '4.4.1' ) {    exclude module : 'flute'    exclude module : 'org.eclipse.orbit.mongodb' } // also working 4.2.1a  // not compiling:     4.6.0-20160607 // not running:  4.5.0a Step 2: create POJO and a suitable BIRT DataSource for the Designer: http://yaragalla.blogspot.de/2013/10/using-pojo-datasource-in-birt-43.html DataSource really needs the open, next and close Methods build as jar, needed as such in BIRT Designer Step 3: use BIRT runtime in your Spring Boot Controller: InputStream reportDesign = getClass(). ...
Mehr anzeigen

Debugging angular 4 Jasmin/Karma tests with Visual Studio Code

Bild
remember how to debug with visual studio code an angular cli generated jasmin test. Change the config: add to visual studio code launch.config ... { "type" : "chrome" , "request" : "attach" , "name" : "Attach to karma test runner" , "sourceMaps" : true , "port" : 9333 , "webRoot" : "${workspaceRoot}" , "sourceMapPathOverrides" : { "webpack:///*" : "${workspaceRoot}/*" } }, add to karma conf.js ... singleRun: false , browsers: [ 'ChromeDebugging' ], customLaunchers: { ChromeDebugging: { base: 'Chrome' , flags: [ '--remote-debugging-port=9333' ] } }, Start the debugging session: ng test set some breakpoints in visual studio code start " Attach to Karma Tests " in Visual Studio Code refre...
Mehr anzeigen