获取
git checkout dev
git pull
git checkout zhujiao
推送
git push origin zhujiao
合并分支
git checkout dev
git pull
git merge zhujiao
git push origin dev
git checkout zhujiao
git merge dev
解决冲突
项目经理的操作
git checkout dev
from django.conf.urls import include, url
from django.contrib import admin
urlpatterns = [
url(r'^admin/', include(admin.site.urls)),
url(r'^',include('df_goods.urls')),
]
git add dailyfresh/urls.py
git commit -m '配置前台url'
git push origin dev
员工助教的操作
git checkout dev
from django.conf.urls import include, url
from django.contrib import admin
urlpatterns = [
url(r'^admin/', include(admin.site.urls)),
url(r'^user/',include('df_user.urls')),
]
git add dailyfresh/urls.py
git commit -m '配置用户模块url'
git push origin dev
git pull
from django.conf.urls import include, url
from django.contrib import admin
urlpatterns = [
url(r'^admin/', include(admin.site.urls)),
<<<<<<< HEAD
url(r'^user/',include('df_user.urls')),
=======
url(r'^',include('df_goods.urls')),
>>>>>>> ae79e1fd93d0d9e7f8ca36481c611a2b4a38a9db
]
from django.conf.urls import include, url
from django.contrib import admin
urlpatterns = [
url(r'^admin/', include(admin.site.urls)),
url(r'^user/',include('df_user.urls')),
url(r'^',include('df_goods.urls')),
]
git add dailyfresh/urls.py
git commit -m '配置用户模块url-解决冲突后'
git push origin dev