Git 2.47 Released With Improvements & Encouraging More Positive Code Reviews

[uid313]

Git even tells you, that you have to stash. What else do you expect? That a pull quietly eradicates your changes?.

But I have to stash it even if I created a new file or touched an existing file that the upstream didn't change so I think Git should be nice and fetch the latest commits.

Another problem I had is that I touched line 10 in a file and when I fetch I get a merge conflict even though the commit in the remote touched line 50, I think Git should be friendly and let me auto-resolve the conflict since they are on different lines.

Maybe Git could tell offer to stash my changes for me, fetch the latest commits, then unstash my changes.

Git tells you how to set your merge strategy.

I don't even know what a merge strategy is and I don't think I want to know either. Git should just pick one merge strategy as the default one so I don't have to know or care then the nerds can change it to something else if they don't like the default setting.

[Tuxee]

Maybe Git could tell offer to stash my changes for me, fetch the latest commits, then unstash my changes.

That's actually what some GUI tools (or in my case my IDE) does for me.

[uid313]

That's actually what some GUI tools (or in my case my IDE) does for me.

I wish the git CLI program did that too for me, but then that would only be one issue, there are other issues such as getting merge conflicts when I touched line 10 and someone else touched line 500.