On 3/28/21 8:41 AM, Philip Leishman wrote:
Oh!! I have been using git pull! There are some internet articles indicating that git pull is evil. Hmmm.....
It does a merge which might not be what you want. It can lead to a huge mess of merges that is hard to untangle. I've been there several times.
If you have no commits to the branch you are pulling, however, git pull is the same as git fetch/rebase. So, that might be why it's never caused you any trouble.
The problem comes when you fetch a branch you have commits on and then do a git status. It will tell you to do a "git pull" and if you do, you'll end up with a mess. Especially if you do not have push privileges.
My simplified, non-branching, git workflow (working directly in master) will result in that message coming up every now and then.
You can probably keep using git pull. Just be aware that it is a merge and if git ever tells you to pull, that is probably not a good idea.
Ted. _______________________________________________ Rosegarden-devel mailing list Rosegarden-devel@lists.sourceforge.net - use the link below to unsubscribe https://lists.sourceforge.net/lists/listinfo/rosegarden-devel
