┏┳┓┏━╸┏━┓┏━╸╻┏┓╻┏━╸
┃┃┃┣╸ ┣┳┛┃╺┓┃┃┗┫┃╺┓
╹ ╹┗━╸╹┗╸┗━┛╹╹ ╹┗━┛
Multiple parallel workflows are encouraged
-> unavoidable conflicts
- Project guideline on how to handle conflicts
- For more advanced usage:
- $ git rerere
- different merging strategies