Skip to content

Conversation

@lvl0-statistician
Copy link

made some changes to the branch. the code seems to be okay now.
it says it is ready to be merged with the base repository : HMMA238-2021/git-tutorial

however, i can't find a way to merge this branch to the master branch on my local repo.
i keep getting conflicts between the two.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant