Re: [GSoC] My Git Dev Blog - Week 3

On 07-Jun-2021, at 14:27, Bagas Sanjaya [off-list ref] wrote:

Hi Atharva,

On 06/06/21 19.26, Atharva Raykar wrote:

quoted

Hi,
Here is my latest instalment in my weekly Git blog:
http://atharvaraykar.me/gitnotes/week3

You said:

quoted

Simple enough, I thought. Just fast-forward merge (A) on master, and then, uhh, cherry pick and apply (B) on top of the newly merged (A). Resolve any conflict in this stage. That way I get (A) and (B) in their pristine individuality, as well as a third branch that combines both the changes.

But before, you said:

quoted

Once it was becoming clear that would not happen, I thought of combining those two branches on another branch (that would hold all my patches so far).

Are you merging two branches that contains your separated patchsets directly to your own `master` branch, or are you merging them to temporary branch that is branched directly from `master`?

I actually created another branch based off master, and then applied
those two patches on them. Me mentioning 'merge (A) on master' was a
mistake. I'll correct it.

Also, you advised that:

quoted

Check your resolved conflict before continuing the merge

IMO, once you have resolved all the conflicts, compile and test before commit the resulting merge. This way, it will be nicer for review.

Agreed.

Thanks.

-- 
An old man doll... just what I always wanted! - Clara