Git is cool and all but part of me misses CVS.
-
-
-
Towards the end of Opera using CVS tagging was so slow it wasn’t usable anymore. I think git is a good successor.
- Još 2 druga odgovora
Novi razgovor -
-
-
Or git pull —rebase.
-
Rebase doesn’t auto stash so you still need to set that up - which is what I forgot
Kraj razgovora
Novi razgovor -
-
-
I'm personally glad that git complains about unstashed changes before a rebase, because I often forget that I want those changes to be rebased as well :) I guess you know already, but just in case — git add -i instead of -p can do *everything*, including conflict resolution.
-
I have to try that: git add -i instead of git mergetool for conflict resolution.
- Još 3 druga odgovora
Novi razgovor -
-
-
Tusen you for this!
Hvala. Twitter će to iskoristiti za poboljšanje vaše vremenske crte. PoništiPoništi
-
-
-
Thank you!!
Hvala. Twitter će to iskoristiti za poboljšanje vaše vremenske crte. PoništiPoništi
-
-
-
Well played!
Hvala. Twitter će to iskoristiti za poboljšanje vaše vremenske crte. PoništiPoništi
-
-
-
I wish git pull would tell me if it would cause a merge conflict and stop if so. By default it's Russian roulette.
- Još 7 drugih odgovora
Novi razgovor -
Čini se da učitavanje traje već neko vrijeme.
Twitter je možda preopterećen ili ima kratkotrajnih poteškoća u radu. Pokušajte ponovno ili potražite dodatne informacije u odjeljku Status Twittera.
Speaker, CoC required, she/her
Me: Wait, didn't I write a blogpost on "Everything I Everything I Know About Git"??
Me: Oh, past me rocks!
"git config --global rebase.autoStash true"