Bantu Saya Merge Dua Buah Branch di Gitlab

 

saya punya dua branch yaitu satu master dan satu branch lain, sya sudah kembangkan aplikasi di branch master dan tim lain mengerjakan di branch satunya, disaat sya merge malah error, mohon bantuannya, sya sertakan screenshoot error di lampiran. sya pakai gitlab.

Git Github

Project Class: Open to Suggestions
Published Budget: Open to Suggestions
Finish Days: 1
Published Date: 18/02/2020 18:37:00 WIB
Start Date: 24/02/2020 10:41:01 WIB
Project Status: Closed
Accepted Worker: safi07 (safi07)
Accepted Budget: Rp 85,000
Project Ending: Completed
Finish Date: 24/02/2020 11:36:14 WIB

Project Owner

ressrich
Kota Jakarta Pusat
    
9.92/10.00
638 Point
#523 dari 223,403
Rated Worker: 10.00/10.00

saya senang dengan kualitas bagus

Accepted Worker

safi07
Kab. Pamekasan
    
10.00/10.00
775 Point
#397 dari 223,403
Rated Owner: 10.00/10.00

Mantap bos

  User Bids

andipratama
    
10.00/10.00

MasterCyber
    
9.54/10.00

safi07
    
10.00/10.00

Nabil_Perdana
    
0.00/10.00

nanodev
    
0.00/10.00

shinichi_koding
    
0.00/10.00

figa_ozora
    
0.00/10.00

sididit
    
0.00/10.00

Recommended Workers

Iswanto

21,968 points
454 projects
    
9.73/10.00

Muhammad.Rahman

13,704 points
153 projects
    
9.89/10.00

steven.comptia

36,455 points
824 projects
    
9.97/10.00

MCandraEkaSaputra

12,057 points
79 projects
    
9.87/10.00

genestiel

7,326 points
22 projects
    
10.00/10.00

Recommended Services

Pembuatan bot line

Rp 1,500,000
6 sales
    
10.00/10.00

Aplikasi Jasa Servis dan panggil Teknisi

Rp 3,800,000
2 sales
    
10.00/10.00

Pembuatan Bot Telegram & Web Admin

Rp 1,500,000
3 sales
    
10.00/10.00

Open Projects

Membuat website

Open to SuggestionsOwner: Viapulsa
Deadline: 14 days

Update dan upgrade Framework Nuxt.JS

Rp 2,000,000Owner: dajoel2000
Deadline: 21 days

Jago PHP Masuk Sini. Pembenahan Script Php Proxy

Open to SuggestionsOwner: thecode
Deadline: 7 days

membuat mockup design

Open to SuggestionsOwner: syaifulbahri
Deadline: 3 days

Mencari Website bervisitor

Open to SuggestionsOwner: Gieyok
Deadline: 7 days