Git status during merge conflict: Difference between revisions
From genomewiki
Jump to navigationJump to search
(Created page with " Running git status during a merge-conflict can often show a scarily-large number of files. These represent the work of other people in the group. If it has been several days sin...") |
No edit summary |
||
| Line 1: | Line 1: | ||
Running git status during a merge-conflict can often show | Running git status during a merge-conflict can often show | ||
a scarily-large number of files. These represent the work | a scarily-large number of files. These represent the work | ||
| Line 7: | Line 6: | ||
This is in fact perfectly normal for merge-commits. | This is in fact perfectly normal for merge-commits. | ||
There is no need to worry. | There is no need to worry. For each conflicted file, | ||
listed under git status with the editor, looking for | listed under git status: | ||
git conflict markers. After resolving the conflict, | Resolve the conflicts with the editor, looking for git conflict markers. | ||
do git add for each file. When all have been resolved, | vi <somefile> | ||
After resolving the conflict, | |||
do git add for each file. | |||
git add <somefile> | |||
When all have been resolved, | |||
do | do | ||
git commit -m 'fixed merge conflict.' | git commit -m 'fixed merge conflict.' | ||
Revision as of 01:14, 31 August 2016
Running git status during a merge-conflict can often show a scarily-large number of files. These represent the work of other people in the group. If it has been several days since your last pull, there could be dozens and dozens of files that were changed by other people.
This is in fact perfectly normal for merge-commits. There is no need to worry. For each conflicted file, listed under git status: Resolve the conflicts with the editor, looking for git conflict markers.
vi <somefile>
After resolving the conflict, do git add for each file.
git add <somefile>
When all have been resolved, do
git commit -m 'fixed merge conflict.'
