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.
19 lines
506 B
19 lines
506 B
|
|
|
|
|
|
┏┳┓┏━╸┏━┓┏━╸╻┏┓╻┏━╸
|
|
┃┃┃┣╸ ┣┳┛┃╺┓┃┃┗┫┃╺┓
|
|
╹ ╹┗━╸╹┗╸┗━┛╹╹ ╹┗━┛
|
|
|
|
|
|
|
|
Multiple parallel workflows are encouraged
|
|
-> unavoidable conflicts
|
|
|
|
- Project guideline on how to handle conflicts
|
|
|
|
- For more advanced usage:
|
|
- $ git rerere
|
|
- different merging strategies
|
|
|
|
|