git - Unwanted stuff written in file when cherry-picked -


recently got know cherry-pick command in git, , turns out useful command. learnt resources on how use cherry-pick contents other's repo. after used command, contents got cherry-picked other's repo branch, alongwith them had few lines in different parts of file,

<<<<<<< head <<<<<<< head <<<<<<< head  >>>>>>> 53de559... >>>>>>> 0fa87af

(such types of unwanted stuff present wherever changes made). want know whether these lines affect file or required git. if not required how remove them.

i followed steps described here


Comments

Post a Comment

Popular posts from this blog

vue.js - Create hooks for automated testing -

Image
qa guys complained can't automate frontend testing. because our html looks same outside. lazy hack did this <template> <div :role="$options.name"> ... </div> </template> <script> export default { name: 'vmcomponentname' } </script> which takes name script , applies html. in browser get: <div role="vmcomponentname"> ... </div> line :role="$options.name" goes in every component. is there dry er solutions? please share. additional details i'll explain in details looking for. imagine have vmusercreate form creates user. test case can create user . to automatically test without role, have use following selector: .wrapper > .wrapper > .wrapper > .submit-button the test extremely brittle (will break lot). if use roles can use [role="vmusercreateform"] .submit-button selector. many folds less brittle. so basically, i'm ...
Read more

php - Vagrant up error - Uncaught Reflection Exception: Class DOMDocument does not exist -

i've set bento/ubuntu-16.04 vagrant box using php 5.6, , getting following error quite few times when try , run shell script: "uncaught reflection exception: class domdocument not exist". i've tried adding following top of script (not together), each no success: "sudo apt-get install php5.6-xml", "sudo apt-get install php5-xml", "sudo apt-get install php-dom" i've tried resetting server "sudo service apache2 restart". does have suggestions?
Read more

serial port - hub4com OVERRUN Error -

i trying split physical serial port (com3) 2 or more virtual ports using com0com create virtual ports , hub4com split them. here commands use create virtual ports: install 0 portname=com100 portname=com101 change com100 emubr=yes, emuoverrun=yes change com101 emubr=yes, emuoverrun=yes install 1 portname=com110 portname=com111 change com110 emubr=yes, emuoverrun=yes change com111 emubr=yes, emuoverrun=yes the commands use split port: hub4com --route=0:all --baud=115200 \\.\com3 --baud=115200 \\.\com101 --baud=115200 \\.\com111 here output along error get: com3 open("\\.\com3", baud=115200, data=8, parity=no, stop=1, octs=on, odsr=off, ox=off, ix=off, idsr=off, ito=0) - ok com101 open("\\.\com101", baud=115200, data=8, parity=no, stop=1, octs=on, odsr=off, ox=off, ix=off, idsr=off, ito=0) - ok com111 open("\\.\com111", baud=115200, data=8, parity=no, stop=1, octs=on, odsr=off, ox=off...
Read more