Well, fixing bugs and resolving conflicts is two different things.
A merge conflict is an event that occurs when Git is unable to automatically resolve differences in code between two commits. Resolving conflicts is integral part of merging, you are expected to resolve conflicts when it happens.
A bug is an error, flaw or fault in your software that causes it to produce an incorrect or unexpected result, or to behave in unintended ways. No one wants to fix bugs he doesn't own, but, you can merge any time from master, meaning, you can assume that some point on master was stable, and I would count on that and merge that point of time into your branch. (could be after the bug was fixed or before the bug existed)
I would fear, that merging at different stages in history would cause conflict, that I have to manually fix.
Is it better to see this?
Or, fix bugs in "feature" branch when it actually appears?
Well, fixing bugs and resolving conflicts is two different things.
A merge conflict is an event that occurs when Git is unable to automatically resolve differences in code between two commits. Resolving conflicts is integral part of merging, you are expected to resolve conflicts when it happens.
A bug is an error, flaw or fault in your software that causes it to produce an incorrect or unexpected result, or to behave in unintended ways. No one wants to fix bugs he doesn't own, but, you can merge any time from master, meaning, you can assume that some point on master was stable, and I would count on that and merge that point of time into your branch. (could be after the bug was fixed or before the bug existed)
Does it make sense?
Thanks. Here is what I do.
In short, TIL
git merge
. I have never tried merging in local before. Not really how to fix merge conflict in remote. This might be related.Git Workflow: Do you commit to master on your solo projects?
dAVE Inden ・ Sep 10 '19 ・ 2 min read