When working with SmartGit, resolve the conflict in your file (in your case list.html.twig
):
when using Query|Conflict Solver, SmartGit will ask you whether to stage changes.
when resolving the conflict manually (outside of SmartGit), invoke Local|Resolve once you have fixed the file content.
Then, to finish the rebase, use Commit or Branch|Rebase|Continue.
Note: if anything goes wrong, Discard the rebase and start over by invoking Pull again.