In the development project often encountered in order to submit a demand to produce record times. Some are acceptable, such as carried out in accordance with different functional point of submission. But often there is this, just for a little something to make changes, such as submitting superfluous documents, writing is not standardized and the situation had submitted. Git will submit multiple branch management is chaotic, this time we will consider the possibility of multiple submissions will commit merged together?
As a current most popular version control software, git, of course taking into account this situation. Next, I will demonstrate how to merge operations.
1, using git log --oneline View submit records, which decided to merge commit
2, if we are merged last four commits, use git rebase -i HARD ~ 4, after running pop-editing interface
3, record editing interface has submitted, and details merge command.
4, where I will be modified after three pick for the fixup command, which means three submitted to the first submission after the merger, the information submitted by three after the first sub in; of course you can also use the squash or the other, according to their own demand changes.
5. After editing, save and exit. View Submitted git log change records.