Stuck on an issue?

Lightrun Answers was designed to reduce the constant googling that comes with debugging 3rd party libraries. It collects links to all the places you might be looking at while hunting down a tough bug.

And, if you’re still stuck at the end, we’re happy to hop on a call to see how we can help out.

launch merge tool to solve conflicts

See original GitHub issue

Excellent work!

It would be good if the script has the possibility of asking the user whether it wants to solve the conflicts manually.

Currently it asks:

    conflict  project/docker/docker-compose.yml
  Overwrite /home/yucer/src/tests/project/docker/docker-compose.yml? (y/n) [y]

This would be nice:

    conflict  project/docker/docker-compose.yml
  Overwrite /home/yucer/src/tests/project/docker/docker-compose.yml? (y/n) [y] n
  Solve conflict /home/yucer/src/tests/project/docker/docker-compose.yml? (y/n) [y] y

and then launch a merge-tool.

If you don’t have time, I can try to do it. Just give me a clue of where I have to look first.

Issue Analytics

State:
Created 7 years ago
Comments:5

Top GitHub Comments

1reaction

pykongcommented, Sep 11, 2019

@yucer Couldn’t you just run a task subsequently to the copying process?

0reactions

pykongcommented, Sep 11, 2019

I’d go with @jpscaletti here, thinking that diffing is beyond the scope of this tool, but I in understand your pain. I wouldn’t go down the road of implementing running tasks at different time points relative to the copying process, i.e. before transferring the files.

One hell of a hack might be to call copier recursively via specifying the tasks option in the yaml file. I have no experience doing so, though.