Jim Huang
Jim Huang
After reworking Git commits with `git rebase -i`, you should perform `git push --force` for this branch.
Ensure no generated files such as ELF, log, dump files in Git repository.
You have to rebase `master` branch of upstream. And then, force push.
Don't use `git merge`. Use `git rebase` instead.
Reference instructions: 1. set upstream: `git remote add upstream https://github.com/sysprog21/rv32emu && git fetch upstream` 2. Perform rebase: `git rebase upstream/master` 3. Fix the conflicts.
Before submitting the changes, ensure the completion of executing `clang-format -i *.[ch]`
Reworked yet?
Thank @kksweet8845 again for contributing to this project. However, we shall always merge commits with [better Git commit messages](https://chris.beams.io/posts/git-commit/) for further development. Please split this pull request into the following:...
You should use `git rebase -i` to rework the commits. There should be NO commit which refers to "Merge branch 'master'."
I would like to ask @WeiCheng14159 for reviewing.