merge-conflicts-源码

[{"title":"（ 60 个子文件 1.17MB ） merge-conflicts-源码","children":[{"title":"merge-conflicts-main","children":[{"title":"artifacts","children":[{"title":"branch-commits.png <span style='color:#111;'> 31.67KB </span>","children":null,"spread":false},{"title":"deviated-branches.png <span style='color:#111;'> 40.50KB </span>","children":null,"spread":false},{"title":"final-merge.png <span style='color:#111;'> 46.64KB </span>","children":null,"spread":false},{"title":"no-ff-merge.png <span style='color:#111;'> 46.51KB </span>","children":null,"spread":false},{"title":"add-a-branch.png <span style='color:#111;'> 26.02KB </span>","children":null,"spread":false},{"title":"reverse-merge-after-conflict.png <span style='color:#111;'> 44.79KB </span>","children":null,"spread":false},{"title":"merge-simple-master.png <span style='color:#111;'> 32.56KB </span>","children":null,"spread":false},{"title":"basic-history.png <span style='color:#111;'> 22.90KB </span>","children":null,"spread":false},{"title":"merge-after-conflict.png <span style='color:#111;'> 45.33KB </span>","children":null,"spread":false}],"spread":true},{"title":"index.html <span style='color:#111;'> 22B </span>","children":null,"spread":false},{"title":"favicon.png <span style='color:#111;'> 1.32KB </span>","children":null,"spread":false},{"title":"_layouts","children":[{"title":"resume.html <span style='color:#111;'> 8.25KB </span>","children":null,"spread":false}],"spread":true},{"title":"_sass","children":[{"title":"_normalize.scss <span style='color:#111;'> 7.54KB </span>","children":null,"spread":false},{"title":"_mixins.scss <span style='color:#111;'> 1.63KB </span>","children":null,"spread":false},{"title":"_variables.scss <span style='color:#111;'> 532B </span>","children":null,"spread":false},{"title":"_resume.scss <span style='color:#111;'> 3.81KB </span>","children":null,"spread":false},{"title":"_base.scss <span style='color:#111;'> 870B </span>","children":null,"spread":false},{"title":"_layout.scss <span style='color:#111;'> 1.22KB </span>","children":null,"spread":false}],"spread":true},{"title":"images","children":[{"title":"avatar.jpg <span style='color:#111;'> 26.63KB </span>","children":null,"spread":false},{"title":"screenshot.png <span style='color:#111;'> 72.93KB </span>","children":null,"spread":false},{"title":"femalecodertocat.png <span style='color:#111;'> 103.79KB </span>","children":null,"spread":false}],"spread":true},{"title":"_includes","children":[{"title":"icon-links.html <span style='color:#111;'> 1.99KB </span>","children":null,"spread":false},{"title":"icons","children":[{"title":"icon-linkedin.html <span style='color:#111;'> 884B </span>","children":null,"spread":false},{"title":"icon-dribbble.html <span style='color:#111;'> 1.70KB </span>","children":null,"spread":false},{"title":"icon-facebook.html <span style='color:#111;'> 633B </span>","children":null,"spread":false},{"title":"icon-website.html <span style='color:#111;'> 4.36KB </span>","children":null,"spread":false},{"title":"icon-github.html <span style='color:#111;'> 1.01KB </span>","children":null,"spread":false},{"title":"icon-instagram.html <span style='color:#111;'> 1.21KB </span>","children":null,"spread":false},{"title":"icon-pdf.html <span style='color:#111;'> 1.38KB </span>","children":null,"spread":false},{"title":"icon-twitter.html <span style='color:#111;'> 952B </span>","children":null,"spread":false},{"title":"icon-print.html <span style='color:#111;'> 658B </span>","children":null,"spread":false}],"spread":true},{"title":"head.html <span style='color:#111;'> 905B </span>","children":null,"spread":false},{"title":"print-social-links.html <span style='color:#111;'> 1.40KB </span>","children":null,"spread":false}],"spread":true},{"title":"Gemfile <span style='color:#111;'> 59B </span>","children":null,"spread":false},{"title":"_assets","children":[{"title":"icons","children":[{"title":"icon-pdf.svg <span style='color:#111;'> 1.36KB </span>","children":null,"spread":false},{"title":"icon-dribbble.svg <span style='color:#111;'> 1.68KB </span>","children":null,"spread":false},{"title":"icon-facebook.svg <span style='color:#111;'> 618B </span>","children":null,"spread":false},{"title":"icon-linkedin.svg <span style='color:#111;'> 867B </span>","children":null,"spread":false},{"title":"icon-website.svg <span style='color:#111;'> 4.32KB </span>","children":null,"spread":false},{"title":"icon-print.svg <span style='color:#111;'> 643B </span>","children":null,"spread":false},{"title":"icon-github.svg <span style='color:#111;'> 1014B </span>","children":null,"spread":false},{"title":"icon-twitter.svg <span style='color:#111;'> 934B </span>","children":null,"spread":false},{"title":"icon-instagram.svg <span style='color:#111;'> 1.19KB </span>","children":null,"spread":false}],"spread":true},{"title":"icons.ai <span style='color:#111;'> 373.04KB </span>","children":null,"spread":false},{"title":"resume-web-template.sketch <span style='color:#111;'> 416.00KB </span>","children":null,"spread":false}],"spread":true},{"title":"_data","children":[{"title":"interests.yml <span style='color:#111;'> 338B </span>","children":null,"spread":false},{"title":"skills.yml <span style='color:#111;'> 383B </span>","children":null,"spread":false},{"title":"experience.yml <span style='color:#111;'> 475B </span>","children":null,"spread":false},{"title":"recognitions.yml <span style='color:#111;'> 338B </span>","children":null,"spread":false},{"title":"associations.yml <span style='color:#111;'> 569B </span>","children":null,"spread":false},{"title":"links.yml <span style='color:#111;'> 269B </span>","children":null,"spread":false},{"title":"education.yml <span style='color:#111;'> 137B </span>","children":null,"spread":false},{"title":"projects.yml <span style='color:#111;'> 615B </span>","children":null,"spread":false}],"spread":true},{"title":".bundle","children":[{"title":"config <span style='color:#111;'> 69B </span>","children":null,"spread":false}],"spread":true},{"title":"LICENSE <span style='color:#111;'> 1.05KB </span>","children":null,"spread":false},{"title":"README.md <span style='color:#111;'> 1.03KB </span>","children":null,"spread":false},{"title":"css","children":[{"title":"main.scss <span style='color:#111;'> 217B </span>","children":null,"spread":false}],"spread":false},{"title":"Gemfile.lock <span style='color:#111;'> 6.95KB </span>","children":null,"spread":false},{"title":".gitignore <span style='color:#111;'> 36B </span>","children":null,"spread":false},{"title":"_config.yml <span style='color:#111;'> 1.62KB </span>","children":null,"spread":false}],"spread":false}],"spread":true}]