Never came across merge conflicts and i need help

there are 3 branches, master, A and B.

I pushed codes of A to remote.

Pushed codes of B to remote.

Now I want to merge B to A. And I have conflicts.

Now while trying to do it, there's Cant merge automatically.

How do I resolve this? I want to do it in vs code coz my code is huge and i dont want any syntax error happening while i resolve.

submitted by /u/marv0002
[link] [comments]

Read more here: https://www.reddit.com/r/github/comments/opfxjd/never_came_across_merge_conflicts_and_i_need_help/

Content Attribution

This content was originally published by /u/marv0002 at Github: social coding, and is syndicated here via their RSS feed. You can read the original post over there.

%d bloggers like this: