Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
COMP1204 labs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ao1g22
COMP1204 labs
Commits
8f3578ee
Commit
8f3578ee
authored
2 years ago
by
ao1g22
Browse files
Options
Downloads
Plain Diff
Resolve conflicts on README.md
parents
194c50eb
70ed72f1
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
README
+7
-1
7 additions, 1 deletion
README
with
7 additions
and
1 deletion
README
+
7
−
1
View file @
8f3578ee
...
@@ -8,4 +8,10 @@ I am now editing this file on the main branch
...
@@ -8,4 +8,10 @@ I am now editing this file on the main branch
However, the changes that I made on Branch_a are not here
However, the changes that I made on Branch_a are not here
I am going to try and merge the different files§
I am going to try and merge the different files
I am now editing this vim file on Branch A, this is so that any changes won't affect the main branch but I am from to work on this in isolation
Update: I have merged both files so edits from both branches are now here. I have also removed details such as the >>>head
We are ready to commit
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment