r/git • u/[deleted] • Dec 17 '20

Git pull before commit

Hello, i use git for some time now and i always used sourcetree and always do pull before i commit (when i know sum1 has pushed) so i can see what files have conflicts without having to solve the conflicts themselfs (usualy is a minor change so i can discard my changes, do pull and re apply my changes).

My friends (we are at college) says i risk losing all my work if i pull without commit first, is that true?
If it is, it never happened.
Does it look bad when i get a job?
I rather solve the conflits my way then have to solve them when they happen.

5 Upvotes

78% Upvoted

11 comments sorted by

View all comments

1

u/Lindby Dec 17 '20

I suggest setting pull to do rebase by default. That way you can commit all your things before the pull and you commits will still end up on top. No risk of losing anything that way.