Commit b75eb8c7 authored by Chris Bills's avatar Chris Bills

Update formatting

parent c0da4241
...@@ -131,7 +131,9 @@ If you are responsible for maintaining a project, do yourself a favor and read a ...@@ -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. 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) [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) [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) [Information on merging](http://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging)
### Migrating a Repository from Other Services ### Migrating a Repository from Other Services
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment