CODEWITHSUNDEEP
gitgithub
dato nefaridze
dato nefaridze

Reputation: 139

How to resolve merging conflicts on github

I have merging conflicts. I didn't want to correct it on Github because before I merge it I want to test if it is correct or not. so I downloaded the code and merged the master branch to the feature branch, then I pushed the feature branch to the remote repo. this way there is no merging conflicts. Is my approach correct? what other ways do you suggest?

Upvotes: 1

Views: 173

Answers (1)

VonC
VonC

Reputation: 1323953

This is generally the best practice: merge conflicts should be resolved locally, as you did, because you can then compile and test, before pushing back the result.

An alternative would be, for simple conflicts, to resolve on GitHub, but then to have GitHub Actions to build and run tests.
For example: github-action-tester.

Upvotes: 2

Related Questions