merge request (!1) · Merge requests · Whitney Armstrong / git_challenge · GitLab

Snippets Groups Projects

Open mhattawy requested to merge mhattawy/git_challenge:master into master 8 years ago

Here you go

Activity

mhattawy added 1 commit 8 years ago
added 1 commit

22cfe19c - checkout the conflict

Compare with previous version
mhattawy added 1 commit 8 years ago
added 1 commit

06b53170 - editing

Compare with previous version
Whitney Armstrong @whit 8 years ago

Owner

You have everything in one merge request. I don't want the extra conflicts in a merge. Tip: Isolate the features with their own branch.

Please register or sign in to reply