In the step 8 of ‘Continuous integration with CircleCI’ course, I got stuck at the last step after I committed the changes on the 01_getting_rady_for_class.md.
There were 18 conflicts in the ‘Gemfile.lock’ file between the main and custom-build branches. I couldn’t proceed to ‘Merge pull request’.
I did the following changes in order to pass the CircleCI build:
- For the first 17 conflicts, I picked the code from the main branch.
- For the last conflict on ‘BUNDLED WITH’, I need to pick the code from the ‘custom-build’ (i.e., 1.17.3). Otherwise, I saw an error “You must use Bundler 2 or greater with this lockfile.” in CircleCI log.
As I’m not familiar with the Gemfile.lock file and CI, I couldn’t include the technical details of the root cause here.
Please take a look at this unexpected conflict. Thanks.