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

  1. ┏┳┓┏━╸┏━┓┏━╸╻┏┓╻┏━╸
  2. ┃┃┃┣╸ ┣┳┛┃╺┓┃┃┗┫┃╺┓
  3. ╹ ╹┗━╸╹┗╸┗━┛╹╹ ╹┗━┛
  4. Multiple parallel workflows are encouraged
  5. -> unavoidable conflicts
  6. - Project guideline on how to handle conflicts
  7. - For more advanced usage:
  8. - $ git rerere
  9. - different merging strategies