Git Conflict Resolver
Merge Conflict Resolution
app/controllers/users_controller.rb
Unresolved
Conflict detected during merge of feature/user-auth into main
Current Branch (feature/user-auth)
class UsersController < ApplicationController
before_action :authenticate_user!
def index
@users = User.active.order(:name)
end
def show
@user = User.find(params[:id])
end
end
Incoming Changes (main)
class UsersController < ApplicationController
before_action :authenticate_user!
def index
@users = User.all.order(:created_at)
end
def show
@user = User.find(params[:id])
end
end
AI Resolution Suggestion
Recommended merge: Combine both filters to get active users ordered by creation date
@users = User.active.order(:created_at)
Discussion