tiffanylin43
commented
5 years ago @kkl18 @SylviaCHS
Also, I think we have all codes of the latest version in "zl187/fix_merge" right now.
Closed tiffanylin43 closed 5 years ago
tiffanylin43
commented
5 years ago @kkl18 @SylviaCHS
Also, I think we have all codes of the latest version in "zl187/fix_merge" right now.
@kkl18 @SylviaCHS Hi, Kim and Sylvia! I think I've fixed the merge problem. Now we have a new branch called "zl187/fix_merge" that would be able to merge into "master" and other branches or servers as a merge base. The merge problems should be solved if we start from this branch. All the commites after the "revert" have been saved, too. Sorry again that I've accidentally merged a branch into master, and reverted it, causing this merge problem. Let me know if there's other merge problems.