Visitors to DMC may notice our ever-changing “Quote Board,” documenting the best engineering jokes and team one-liners of the moment.
If the data property
- text goes
here. - text goes here too
list
Step One
Configure the default merge tool, usually at the global level. This only needs to be done once.git config --global diff.tool vscode
git config --global mergetool.vscode.cmd 'code --wait --merge $REMOTE $LOCAL $BASE $MERGED'
Step Two
Configure the default merge tool, usually at the global level. This only needs to be done once.git config --global diff.tool vscode
git config --global mergetool.vscode.cmd 'code --wait --merge $REMOTE $LOCAL $BASE $MERGED'
| Step | Description |
|---|---|
| Step One | Configure the default merge tool, usually at the global level. This only needs to be done once.git config --global diff.tool vscode |
| Step Two | Call the mergetool with the named tool command vscode when a merge conflict occurs during a push/pull (or manual merge).git mergetool -t vscode |
| Step Three | Git will automatically create temporary LOCAL, REMOTE, and BASE files based off of the branches that are being compared. It will then call VSCode with the command-line arguments specified in the configuration above. |
| Step Four | VSCode will open and highlight the differences and allow the developer to pick which changes to keep. |
| Step Five | Once merging is complete, the developer will commit their changes to the local branch and push these changes back to the remote repository. |
| a sdlfkasj deka jsdf asja sdlfkasj deka jsdf asja sdlfkasj deka jsdf asja sdlfkasj deka jsdf asja sdlfkasj deka jsdf asja sdlfkasj deka jsdf asja sdlfkasj deka jsdf asja sdlfkasj deka jsdf asja sdlfkasj deka jsdf asja sdlfkasj deka jsdf asja sdlfkasj deka jsdf asj | a sdlfkasj deka jsdf asja sdlfkasj deka jsdf asja sdlfkasj deka jsdf asja sdlfkasj deka jsdf asj | a sdlfkasj deka jsdf asj | a sdlfkasj deka jsdf asja sdlfkasj deka jsdf asja sdlfkasj deka jsdf asja sdlfkasj deka jsdf asja sdlfkasj deka jsdf asja sdlfkasj deka jsdf asj |
| a sdlfkasj deka jsdf asj | a sdlfkasj deka jsdf asj | a sdlfkasj deka jsdf asja sdlfkasj deka jsdf asja sdlfkasj deka jsdf asja sdlfkasj deka jsdf asja sdlfkasj deka jsdf asja sdlfkasj deka jsdf asja sdlfkasj deka jsdf asja sdlfkasj deka jsdf asja sdlfkasj deka jsdf asja sdlfkasj deka jsdf asj | |
| a sdlfkasj deka jsdf asj | a sdlfkasj deka jsdf asj | ||
| a sdlfkasj deka jsdf asj | a sdlfkasj deka jsdf asj | a sdlfkasj deka jsdf asj | |