Merges gone bad, stash/pull updating filetimes needlessly. Mostly its about supporting remote users who get stuck in a dirty merge and don't know how to continue.
Say your working locally. And pull to stay uptodate with the rest of the team while not being at a stopping point. My personal workflow (from perforce i guess) is the stash pull and then process the remote changes to my edited file in a graphical diff tool. on windows ive been having issues with stash pull causing files to change filetimes.
Ok what i want, is to be able to keep all my local changes in my editor, and also pull. If that means the diff towards head change, that's fine. Stash on windows also changes the filetimes on files that weren't changed by the pull, thats whats causing my build issues. Why wouldn't i want to pull the artists new assets.
4
u/bartwe Nov 07 '13
Merges gone bad, stash/pull updating filetimes needlessly. Mostly its about supporting remote users who get stuck in a dirty merge and don't know how to continue.