Skip to content
Snippets Groups Projects
Commit 8f3578ee authored by ao1g22's avatar ao1g22
Browse files

Resolve conflicts on README.md

parents 194c50eb 70ed72f1
No related branches found
No related tags found
No related merge requests found
...@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment