Commit fd5f797a authored by Overbeeke, Lennert van's avatar Overbeeke, Lennert van
Browse files

Merge branch 'merge-process-testing' into 'master'

Test merge request. Can we discuss the changes line by line?

See merge request overb015/git-help!1
parents 743c2a8a 997f6ab6
# git-help
Basic tips for Git and GitLab
\ No newline at end of file
Basic tips for Git and GitLab - edited - edited #2 after comment
## Edit made in a branch
Multiple lines of text could be added
And the merge process should allow each lines to be discussed
and merged individually.
I also made an edit to lines in the original to see how that turns out
in a merge.
## Edit made during merge using Web IDE
You can further edit the documents using the Web IDE while in merge request mode.
Committing these changes just adds a commit to the branch being merged,
as if you made the edit before the merge request and then decided to merge.
The purpose for this is to edit your proposal without having to cancel and retry.
\ No newline at end of file
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