search

hatchways / team-water-polo

1 stars 1 forks source link

Add 'robert' to team_names #23

Closed robertjhull closed 2 years ago

robertjhull commented 2 years ago

What this PR does (required):

Screenshots / Videos (required):

team-names

Any information needed to test this feature (required):

moffatethan commented 2 years ago

We'll just have to solve the merge conflict here before merging Robert! 😄

VAggrippino commented 2 years ago

hehe I got mine in first, so there were no merge conflicts :grin: I think the point of that exercise was to create a situation in which one of us would have a merge conflict.

Unfortunately, I've had a lot of experience with merge conflicts. They can get pretty bad, but this one won't be. If you guys would like, I can hop in on a call and explain the conflict file and the meanings of the symbols and codes.

moffatethan commented 2 years ago

@robertjhull Just giving you a ping on this, if we could get this merged that's fine or I can just close this PR it's up to you 😄

robertjhull commented 2 years ago

@moffatethan just merged it.