Commit merge conflict fixes to the branch with changes

Question

I have a master and a branch A.

I'm trying to get changes to go from A to master.

However, there are merge conflicts.

Currently, when I use git merge or similar things (for example, IntelliJ's built-in merge conflict resolver or SourceTree + KDiff3), when there are conflicts, I can fix them.

However, the fixes I make are done on the master branch.

This means with a protected remote master (i.e. via GitHub) where you can't push directly to master, I can't actually commit the merge conflict fixes.

Is there a way to make edits committed to A and then merge them altogether into master?

I can get this behavior using GitHub's merge conflict editor - when you use it, it commits the changes into branch A and then you still have to do code review, etc. to commit into master. But I would like to be able to do the merge conflict resolution in my IDE, ideally.

Edit: further searching has suggested that I can actually merge master into A, resolving conflicts in the process, and then merge A back into master. Can anyone confirm if that sounds right?

If your fixes are made on master branch then your current HEAD is master. I guess you have to checkout to branch A first and then make the conflict changes. — rootkonda
– rootkonda, Commented Feb 20, 2020 at 0:30
your latest comment sounds right: 1) git checkout A && git merge master (this merges master into A); 2) resolve conflicts; 3) git add <what needs to be committed> && git commit; 4) git checkout master && git merge A; Hope it helps — azbarcea
– azbarcea, Commented Feb 20, 2020 at 0:31
Thanks, just tried that and it worked great! Feel free to post as an answer if you like. — rococo
– rococo, Commented Feb 20, 2020 at 0:38

rootkonda · Accepted Answer · 2020-02-20 00:40:38Z

1

If your fixes are made on master branch then your current HEAD is master. I guess you have to checkout to branch A first and then make the conflict changes and then do a merge to master.

answered Feb 20, 2020 at 0:40

rootkonda

1,7831 gold badge8 silver badges11 bronze badges

Sign up to request clarification or add additional context in comments.

Collectives™ on Stack Overflow

Commit merge conflict fixes to the branch with changes

1 Answer 1

Comments

Your Answer

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

Comments

Your Answer

Sign up or log in

Post as a guest

Related