StariumXCV
Home
Developer Workflow
Merging Dev
Step Two A No Conflict Merge
git merge
In vim, enter
:x
and press
Enter
Previous Page
Next Page
Step One Preparing For The Merge
Step Two A No Conflict Merge
Step Two B Resolving Conflicts