奇妙的bug

背景

Git 两个分支,修改同一个文件

原始文件

if not sign:
	continue
data_dict = {}
data_dict['user'] = user
data_dict['product_id'] = product_id
data_dict['real_storage_location'] = real_storage_location
data_dict['warehouse_name'] = rack_info['warehouse_name']

分支一

if not sign:
	continue
data_dict = {}
data_dict['user'] = user
data_dict['product_id'] = product_id
data_dict['real_storage_location'] = real_storage_location
data_dict['warehouse_name'] = rack_info['warehouse_name']
data_dict['notes'] = '其他入库-系统推荐'

# 新增内容
from warehouse.models.output import move_rack
move_rack().update_stock_rack_manage(
	{'relax_rack_list': [], 'add_rack_list': add_rack_list})

分支二  

if sign:
    # 代码缩进了一段
	data_dict = {}
	data_dict['user'] = user
	data_dict['product_id'] = product_id
	data_dict['real_storage_location'] = real_storage_location
	data_dict['warehouse_name'] = rack_info['warehouse_name']
	data_dict['notes'] = '其他入库-系统推荐'

异常结果

if sign:
    # 代码缩进了一段
	data_dict = {}
	data_dict['user'] = user
	data_dict['product_id'] = product_id
	data_dict['real_storage_location'] = real_storage_location
	data_dict['warehouse_name'] = rack_info['warehouse_name']
	data_dict['notes'] = '其他入库-系统推荐'

# 新增内容
from warehouse.models.output import move_rack
move_rack().update_stock_rack_manage(
	{'relax_rack_list': [], 'add_rack_list': add_rack_list})

正常结果

if sign:
    # 代码缩进了一段
	data_dict = {}
	data_dict['user'] = user
	data_dict['product_id'] = product_id
	data_dict['real_storage_location'] = real_storage_location
	data_dict['warehouse_name'] = rack_info['warehouse_name']
	data_dict['notes'] = '其他入库-系统推荐'

	# 新增内容
	from warehouse.models.output import move_rack
	move_rack().update_stock_rack_manage(
		{'relax_rack_list': [], 'add_rack_list': add_rack_list})

总结

避免两个分支同时修改同一个文件中的同一个函数.