Never* use Git pull [video]

#1

Post by benfreu » Tue, May 07, 2024, 7:08 PM UTC

Re: Never* use Git pull [video]

#2

Post by rsoto » Tue, May 07, 2024, 8:03 PM UTC

Great explanation, just last week I was explaining these concepts to a new dev in our team. The visuals are really helpful to get the point across.

Re: Never* use Git pull [video]

#3

Post by TheCleric » Tue, May 07, 2024, 8:03 PM UTC

I feel like this is "solving" a problem that doesn't exist in good workflows. How often are you pulling from a shared branch that you are making local commits to? Each of the people in the video should be branching off main and doing pull requests to get back into main.

Re: Never* use Git pull [video]

#4

Post by shrimp_emoji » Tue, May 07, 2024, 8:07 PM UTC

TheCleric wrote: post #3

I feel like this is "solving" a problem that doesn't exist in good workflows. How often are you pulling from a shared branch that you are making local commits to? Each of the people in the video should be branching off main and doing pull requests to get back into main.

All that shared branch needs is submodules to bump that workflow from Ultraviolent to Nightmare difficulty.

Re: Never* use Git pull [video]

#5

Post by ukoki » Tue, May 07, 2024, 8:15 PM UTC

don't forget autostash

alias gupa="git pull --rebase --autostash"

Re: Never* use Git pull [video]

#6

Post by Spivak » Tue, May 07, 2024, 8:31 PM UTC

TheCleric wrote: post #3

I feel like this is "solving" a problem that doesn't exist in good workflows. How often are you pulling from a shared branch that you are making local commits to? Each of the people in the video should be branching off main and doing pull requests to get back into main.

> How often are you pulling from a shared branch that you are making local commits to

When more than one dev is working on a feature branch? You could take feature/a, branch off feature/a.1 for your local work but at some point you gotta incorporate work from feature/a. Not so different from origin/main -> main.

git pull --ff-only should really be the default (changeable) behavior.

Re: Never* use Git pull [video]

#7

Post by Shorel » Tue, May 07, 2024, 8:54 PM UTC

Awesome! I completely agree with this approach. I use a slightly different alias, but that's it.

It provides a clean commit history, without actually rewriting the commit history.

I wish more developers in the company used this approach.

Re: Never* use Git pull [video]

#8

Post by kazinator » Tue, May 07, 2024, 9:10 PM UTC

I've not used "git pull" since 2010. I always "git fetch" remote objects, and rebase with an explicit "git rebase".

Re: Never* use Git pull [video]

#9

Post by kazinator » Tue, May 07, 2024, 9:11 PM UTC

TheCleric wrote: post #3

I feel like this is "solving" a problem that doesn't exist in good workflows. How often are you pulling from a shared branch that you are making local commits to? Each of the people in the video should be branching off main and doing pull requests to get back into main.

> How often are you pulling from a shared branch that you are making local commits to?

Every working/hobbying day for the past decade and a half.

Re: Never* use Git pull [video]

#10

Post by kazinator » Tue, May 07, 2024, 9:12 PM UTC

Spivak wrote: post #6

TheCleric wrote: post #3

I feel like this is "solving" a problem that doesn't exist in good workflows. How often are you pulling from a shared branch that you are making local commits to? Each of the people in the video should be branching off main and doing pull requests to get back into main.

> How often are you pulling from a shared branch that you are making local commits to When more than one dev is working on a feature branch? You could take feature/a, branch off feature/a.1 for your local work but at some point you gotta incorporate work from feature/a. Not so different from origin/main -> main. git pull --ff-only should really be the default (changeable) behavior.

The other choice being git pull --rebase, with "git merge" being removed from the git suite.