Auto Merge Gemfile.lock - Will Leinweber

Auto Merge Gemfile.lock - Will Leinweber

Here’s the problem: you’re working on a topic branch and add a gem to your Gemfile, and someone e...概要を表示 Here’s the problem: you’re working on a topic branch and add a gem to your Gemfile, and someone else has added a gem to master before you’re done. When you go to rebase, every single one of your commits is going to have a conflict with Gemfile.lock. All you have to do is run bundle lock to get bundler to relock then add that and continue your rebase. But that’s so damn tedious. Good news! I just f

• Git
• Ruby