Technical contributor onboarding/Resolve merge conflict

Introduction
We will try to resolve conflict for patch 591060. You can see that a patch has merge conflict in two places, at the top of the page, and at the bottom of the page.



Update branch
Since the commit is in TemplateWizard repository, make sure you have the latest version.

Fetch the patch
Get the patch from Gerrit.

Rebase the patch
Rebase the patch on top of  branch. Git will let you know that there's a merge conflict.

Git output is not the most readable. will let you know what you need to do.

Conflict
This is the important part of the output, you can ignore the rest for now.

Both your patch and  branch have modified files   and.

We will first resolve the conflict in. Let's take a look at the file.

This is not very readable and probably looks more scary than it is. Portion of the file between  and   is in   branch. Portion of the file between  and   is what is in your patch.

A few packages are updated in master. from 0.15.0 to 0.15.3,  from 0.14.0 to 0.15.0,   from 0.9.0 to 0.10.1.

Edit the file using your favorite text editor so it looks like this.

Let Git know that you've resolved the conflict.

will now say there's only one file left to resolve.

We will now resolve the conflict in. It is automatically generated so you should not edit it manually. Delete the file and recreate it with.

Let Git know that you've resolved the conflict.

will now say there's no conflicts left.

Rebase
Continue the rebase.

Check status.

Use your favorite Git diff tool to check what has changed in the last patch, to make sure everything looks good.