Git Update Local Branch with remote Master

The simple answer – there are plenty of more complicated ones – is to just do a merge, so: (This is effectively the same as you describe in option 2) Depending on your settings, you might not need all of those steps (but doing them all won’t hurt) – I’d recommend reading up on each … Read more