Auto resolve git conflicts in Gemfile.lock
Open
Nobody has claimed this yet.
Bundler
status: triage
- Dominant language
- Ruby
- Stars
- 4k
- Forks
- 1.9k
- Avg merge
- 1d 2h
- Merged PRs (30d)
- 81
Description
If there are merge Conflicts in Gemfile.lock, a dev has to manually resolve them. With git it's usually done by resolving Gemfile, then setting Gemfile.lock to HEAD's previous state with
git checkout HEAD -- Gemfile.lock
bundle install
It would be great if it was automatic, a feature yarn now offers: https://github.com/yarnpkg/yarn/pull/3544
Contributor guide
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
Research direction
Review the reported Gemfile.lock and Gemfile conflict-resolution workflow, then compare it with the linked Yarn pull request. Reproduce the manual git checkout HEAD -- Gemfile.lock and bundle install steps to understand the current behavior. Done means the equivalent Gemfile.lock handling is automatic after a conflict.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- git, ruby
- Domain
- tooling
- Issue type
- Feature
- Difficulty
- 5/5
- Estimated time
- Over a week
- Activity status
- Stale
- Clarity
- Mostly clear
- Newbie friendliness
- 30/100