4 ms·
For the conflicts, note that in Git you can do git config --global merge.conflictstyle diff3 to get something like what is shown in the article.
by WCSTombs 7mo ago
For the conflicts, note that in Git you can do
git config --global merge.conflictstyle diff3
to get something like what is shown in the article.
- NetOpWibby 7mo agoThis should be the default. Nearly every time I see a complaint about git, someone comes through with a command like this. Is there a collection of similar tips that makes git better to use? If not, there should be.