Resolve conflicts during merging branches

Question

Resolve conflicts during merging branches

Opened this issue 4 months ago · 0 comments

✏️ Description

articles-head.spec.ts file is a placeholder with no real test. A test should be added.
Work on branch ISSUE-3/update-head-articles-test and add commit with test.

Then verify changes added on branch ISSUE-2/update-head-articles. Looks like someone worked on the same test. You think that your test makes more sense but you like one solution from this branch - enum Enpoints.
Merge branch ISSUE-2/update-head-articles into your branch ISSUE-3/update-head-articles-test and resolve conflicts taking what's best from both branches.