@@ -131,7 +131,9 @@ If you are responsible for maintaining a project, do yourself a favor and read a
Merging is easy, especially within GitLab, because it can essentially all be done through the web interface using Merge Requests. Rebase (in my opinion) provides a clearer linear history of the project, but requires more understanding of git than this simple guide strives to impart.
[Information on rebasing](http://git-scm.com/book/en/v2/Git-Branching-Rebasing)
[Rebase vs. Merge](http://git-scm.com/book/en/v2/Git-Branching-Rebasing#Rebase-vs.-Merge)
[Information on merging](http://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging)
