search

best-practice-and-impact / qa-of-code-guidance

Guidance for quality assurance of code for civil service researchers and analysts.
https://best-practice-and-impact.github.io/qa-of-code-guidance
Other
74 stars 18 forks source link

Add information about Git rebase #159

Open Jacobb164 opened 1 year ago

Jacobb164 commented 1 year ago

Include solutions for how to rebase code in the merge conflict resolution, version control section.

https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase

r-leyshon commented 1 month ago

A consideration of this would be ideal: https://git-scm.com/book/en/v2/Git-Branching-Rebasing#_rebase_peril Straight forward english explanation in the same way you treat liskov substitution principle would be fantastic.