1. First, delete the local branch
git checkout -d cxa
2. Therefore, there is currently only the master branch.
3. Pull the latest code of the master locally
git pull
4. Create a new branch
git checkout -b cxa
5. After modifying the code, right-click on the project root directory and select Commit Directory
. A pop-up box will tick the content that has been tracked and modified. Enter the content of the commit.
6.git push
About the operation of rebase, first check the history
git log
Then use
git rebase -i HEAD~2
Then s (merge), p (reserve) and
finally
push (force) when using pycharm push