sp
/
gitWorkshopLabene
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
5 Commits
1 Branch
0 Tags
50 KiB
Branch: main
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'main'
${ noResults }
gitWorkshopLabene/026.vpm

18 lines
494 B
Raw Permalink Normal View History

First Versions of *vpm
2 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
  4. ┏━╸┏━┓┏┓╻┏━╸╻ ╻┏━╸╺┳╸┏━┓
  5. ┃ ┃ ┃┃┗┫┣╸ ┃ ┃┃ ┃ ┗━┓
  6. ┗━╸┗━┛╹ ╹╹ ┗━╸╹┗━╸ ╹ ┗━┛
  10. Git tracks (per hunk-) conflicts over three files:
  11. - base/common
  12. - ours
  13. - theirs
  15. - $ git config --global merge.conflictstyle diff3
  16. - Often helpful to have common state