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.
Support for merge-strategies
See original GitHub issueI found merge strategies (https://git-scm.com/docs/merge-strategies) missing. For example I need auto-resolve merging conflicts in favor or mainstream (e.g. remote/master). With git I could do it by
pull/merge --strategy-option theirs
I find not way to do it with isomorphic-git
Issue Analytics
- State:
- Created 4 years ago
- Reactions:6
- Comments:8 (4 by maintainers)
Top Results From Across the Web
Git merge strategy options & examples | Atlassian Git Tutorial
Git merge strategies include resolve, recursive, octopus, ours, and subtree. Learn the pros and cons, and which strategy and options are best for...
Read more >merge-strategies Documentation - Git SCM
This is the default merge strategy when pulling or merging one branch. This strategy can only resolve two heads using a 3-way merge...
Read more >AWS CodeCommit Supports Two Additional Merge Strategies ...
AWS CodeCommit now supports two additional merge strategies for pull requests: squash merges and three-way merges, and a conflict resolution ...
Read more >About merge methods on GitHub
The default merge method creates a merge commit. You can prevent anyone from pushing merge commits to a protected branch by enforcing a...
Read more >Merge methods - GitLab Docs
These diagrams show how the feature branch merges into main if you use the Merge commit strategy. They are equivalent to the command...
Read more >
Top Related Medium Post
No results found
Top Related StackOverflow Question
No results found
Troubleshoot Live Code
Lightrun enables developers to add logs, metrics and snapshots to live code - no restarts or redeploys required.
Start Free
Top Related Reddit Thread
No results found
Top Related Hackernoon Post
No results found
Top Related Tweet
No results found
Top Related Dev.to Post
No results found
Top Related Hashnode Post
No results found
@MarcDAFrame original author that did the codding is not working on the project much recently. I’m a new maintainer but I don’t do coding myself. I have little understanding of the codebase. So if you want the support of this, you will need to implement this yourself. You can create a PR (including unit tests) and if they pass I will be able to merge.
Unfortunately in the current state of the project, no one will code a solution to this for you.
any updates on this?