1

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?

Improve this question

1 Answer 1

Reset to default
2

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.

Improve this answer
Sign up to request clarification or add additional context in comments.

Comments

Start asking to get answers

Find the answer to your question by asking.

Ask question

Explore related questions

See similar questions with these tags.