Conflict in merging

Question

I have some troubles in my project angular. Who can help me ?

ERROR in src/app/app-routing.module.ts(5,1): error TS1185: Merge conflict marker encountered.

Possible duplicate of [How to resolve merge conflicts in Git](https://stackoverflow.com/questions/161813/how-to-resolve-merge-conflicts-in-git) — mbojko, Jun 03 '19 at 07:16
@wentjun @mbojko Looks like an error which is being thrown by the `TypeScript` compiler. — David R, Jun 03 '19 at 07:17
@DavidR Yes, the reason why the TS compiler is throwing that error, is because when there are markers being inserted to the code to denote the presence of merge conflicts.. Such markers cannot be properly compiled/transpiled — wentjun, Jun 03 '19 at 07:19
Still, I really can't imagine an answer different than "resolve the merge conflict". — mbojko, Jun 03 '19 at 07:21
Exactly! All will be fine once the merge conflict is resolved.. — wentjun, Jun 03 '19 at 07:23

score 9 · Accepted Answer · answered Jun 25 '21 at 15:01

9

You possibly selected 'add routing' = yes when you first created your app in the Angular CLI, so the file app-routing.module already exists in the src/app folder.

answered Jun 25 '21 at 15:01

Gini Blanco

118
1
6

score 2 · Answer 2 · edited Apr 25 '21 at 16:19

2

Just go through path that is src/app/app-routing.module.ts and delete this app-routing.module.ts file and then again install it using ng g module app-routing --flat --module=app.

edited Apr 25 '21 at 16:19

Dmitry S.

1,544
2
13
22

answered Apr 25 '21 at 09:22

Digvijay Bandgar

21
2

score 0 · Answer 3 · answered Jun 03 '19 at 07:25

Open src/app/app-routing.module.ts file in your editor and look through it. On line 5 there probably is something like <<<<<<< HEAD... Which marks where git could not automatically merge 2 branches and you need to manually edit this file and tell what does it have to look like exactly now.

In other words, remove all non-typescript code.

Conflict in merging

3 Answers3