Charles Z

icon indicating a website link https://bi-an.github.io/blog

icon company Cadence Design System Inc icon location Shanghai icon location Seize the day. 对专业的熟稔，是对时间最好的尊重，也是个人价值最耀眼的所在。

Results 1 comments of Charles Z

Use VSCode diff view for resolving merge conflicts

> > Apologies for the delay in getting back to this. > > Arguments need to be remapped, apparently. Using `"perforce.resolve.p4editor": ".vscode/p4_resolve.sh"` seems to invoke the proper editor (albeit without...