Git Accept All Incoming Changes Merge