Murano

How to deal with Patch in Merge Conflict?

Asked by xiangxinyong

After we commit code branches for a bug or blue print,

how to deal with Patch in Merge Conflict?

Question information

Language:
English Edit question
Status:
Solved
For:
Murano Edit question
Assignee:
No assignee Edit question
Solved by:
Ekaterina Chernova
Solved:
Last query:
Last reply:
Revision history for this message
Best Ekaterina Chernova (efedorova) said : 		#1

Hi!

You need to resolve conflic locally and push updated patch to the review.

Checkout to local branch, that contain the desired patch, perform

git fetch --all
git rebase origim/master

and then resolve conflicts.
I recommend to use meld for that http://meldmerge.org/help/resolving-conflicts.html

You can contact us on irc if you have any issues

Revision history for this message
xiangxinyong (xiangxinyong) said : 		#2

Thanks Ekaterina Chernova, that solved my question.