fork/rust
git clone https://git.julia.blue/fork/rust
3bcad65fbf6
master
1error: encountered diff marker 2 --> $DIR/item.rs:1:1 3 | 4LL | <<<<<<< HEAD 5 | ^^^^^^^ after this is the code before the merge 6LL | fn foo() {} 7LL | ======= 8 | ------- 9LL | fn bar() {} 10LL | >>>>>>> branch 11 | ^^^^^^^ above this are the incoming code changes 12 | 13 = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code 14 = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased 15 = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts> 16 17error: aborting due to previous error 18