I do agree that it is a bit annoying that git has so much trouble pulling with local changes, and that is the one area where svn just simply works better. In every other aspect, I have come to like the "git way" more.
That said, I avoid commandline git as much as possible. I prefer to use TortoiseGit (in Windows, at home), or SourceTree (at work, where I use a mac, and SourceTree is probably the least shitty frontend for git).
I like to say, that for someone who knows Subversion, learning git starts by realizing that all the usual svn concepts, apply to git, just NOT with the remote repository. The svn-like commands work with the local repository clone, and then it has a separate command set for interacting with remotes. Of course it's not a 1:1 match, but it's a good starting point. If you are able to "catch" that, then learning how to work with git becomes a LOT easier.
On Wed, Feb 15, 2017 at 9:01 AM, Zachary Gorden
<drakekaizer666@gmail.com> wrote:
> Why is there a need for anything beyond "git commit" or "git push" or "git
> pull" to do anything?
Good question. I've never used any other git command other than those
(except git checkout). Oh, that's lie, I've also used "git branch",
just like on svn, to create a branch.
Sounds like you've never actually used git? I've never rebased in my
life, and I don't know what other commands even exist.
Best regards,
Alex Ionescu
_______________________________________________
Ros-dev mailing list
Ros-dev@reactos.org
http://www.reactos.org/mailman/listinfo/ros-dev