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:closed
  • Created 7 years ago
  • Comments:5

github_iconTop GitHub Comments

pykongcommented, Sep 11, 2019

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

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.

Read more comments on GitHub >

github_iconTop Results From Across the Web

How to use `git mergetool` to resolve conflicts in Vim / NeoVim
2-min tutorial to do it the quick-and-dirty-way; Concepts for resolving Git conflicts; Setting up different editors / tool for using git mergetool.
Read more >
Git Merge Tools. How to resolve conflicts using Git? - ITNEXT
How do you usually resolve your merge conflicts? Which merge tools do you usually use? I write weekly posts on git, GitHub, and...
Read more >
My favorite tools to resolve git merge conflicts - Blog
GUI tools. Sublime Merge is a powerfull merge tool, intuitively understandable and with good UI. It has free and commercial versions. Free ...
Read more >
How To Resolve Merge Conflicts in Git - phoenixNAP
1. Run the following line in your terminal: git mergetool --tool-help · 2. Change the git config to set the default merge tool:...
Read more >
What's the best visual merge tool for Git? - Stack Overflow
You can change the tool used by git mergetool by passing git mergetool -t=<tool> or ...
Read more >

github_iconTop Related Medium Post

No results found

github_iconTop Related StackOverflow Question

No results found

github_iconTroubleshoot Live Code

Lightrun enables developers to add logs, metrics and snapshots to live code - no restarts or redeploys required.
Start Free

github_iconTop Related Reddit Thread

No results found

github_iconTop Related Hackernoon Post

No results found

github_iconTop Related Tweet

No results found

github_iconTop Related Post

No results found

github_iconTop Related Hashnode Post

No results found