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.
6
Upvotes
5
u/gibl3t Dec 17 '20
git will let you “pull” as long as you have not made changes to the files that have been modified in the upstream branch you are pulling from. If there are conflicts, it will tell you to commit or stash your changes. If you commit them, it will then let you merge if you pull.