Resolving Git Merge Conflicts Jack Lotkowski / Nov 7, 2023 / video git Play video You may also like... Git Merge Tutorial video git Combine branches Git Stash Tutorial video git Set files aside for later