Git development merge Rebase record

  519git status520git LG521git add src/522Git commit-m"RESTful API and portal"  //commit to your local branch first.  523git LG524Git fetch-p//Origin's commit will be pulled to the local  525git LG526Git rebase origin/develop//rebase to Branch  527git status528git LG529git status530git add src/531Git commit-m"rebase origin Develop" //resolve conflicts, and then commit  532git LG533Gitdiff107b458 HEAD534Gitdiffhead~1HEAD535git LG536git branch537git push Origin yhh538git branch539git LG540Git branch AAA//set up a branch casually  541git LG542git checkout yhh//to your own development Branch  543git reset--hard AAA//then force the replacement  544git LG545Git push-f//push to Origin's own development branch  546git LG547git checkout Develop//and develop merge back .  548git merge yhh549Git push-f//Update Origin/develop Branch  550GIT LG

Git development merge Rebase record