i'm having conflict url.py after making commit , migration git. url.py files have errors can no longer view page. how fix conflict, need changes made, other changes other user not needed.
urlpatterns = [ url(r'^$', views.indexview.as_view(), name='index'), url(r'^clients$', views.clients,name='clients'), <<<<<<< head
url(r'^musicplanet$', views.musicplanet_index,name='musicplanet'), url(r'^musicplanet_index$', views.music_post_1,name='musicplanet_index'), =======
url(r'^musicplanet$',views.musicplanet_index,name='musicplanet_index'), url(r'^musicplanet_index$', views.music_post_1,name='music_post_1'), url(r'^mj_index$', views.mj_index,name='mj_index'), ->>>>>>> ec8432a416b3ea08176045749ed674f3edfb2ab6
url(r'^music_post_1$', views.music_post_1,name='music_post_1'), url(r'^music_post_2$', views.music_post_2,name='music_post_2'), so don't need these urls because don't work. tried commenting them out, errors in view.py.
url(r'^musicplanet$',views.musicplanet_index,name='musicplanet_index'), url(r'^musicplanet_index$', views.music_post_1,name='music_post_1'), url(r'^mj_index$', views.mj_index,name='mj_index'),
this application specific issue. merging, , merge conflicts, should covered in decent git tutorial.
https://www.atlassian.com/git/tutorials/
no 1 here can tell merge correct, depend on application.
when have changes same file in same location, in same commit time git might not know do, , require manually resolve conflict. resolve it, should remove lines containing <<<<, ==== , >>>>. there show current branch says commit should be, , other branch says commit should be.
Comments
Post a Comment