I’ve talked about the two main ways to do a “git pull” and “git merge,” and if you’re not in a position to change your workflow in any way, I’ll tell you that this is a very good way to start. I find that having a tool like git “git pull” on my laptop is a huge win because it lets me do all of the pull requests at one time.
Another advantage of this workflow is that it avoids the hassle of waiting for a new git format to be released. This is because git pull is just a simple command line tool, which means that it will work even if you have a really old version of git. In contrast, I find that having a version control system like Subversion is a must if you want to go the git pull route.
This workflow is great, but it also has its downsides. Git pull is the best way to get all the commits on one branch, but using git pull to merge commits might also change the commit history. In fact, it’s entirely possible that you may end up with commits that haven’t been merged in the past.
The worst thing about git pull is that you are essentially pulling the commits from the remote repository that you have already committed to a branch. This is a bad idea, especially for people who don’t know git well. What you should do instead is use git merge instead. This will merge the commits into your local branch and then take the resulting branch to your remote repository, making it possible to have a clean and fully-developed branch that you can easily work on in the future.
git pull is really the more efficient method of doing this. However, git commit –amend adds to the burden of git pull since you do have to create a new branch from scratch and merge the commits into it. What’s good about git merge is that it lets you keep working on the branch you’ve already committed to. It’s faster and more efficient than pulling and merging in new commits. And, you can use a local branch to do the merge for you.
If you’re like me, you probably have a lot of branches. With a few of you, this may be the cause to a git-chk. If you need help with that, ask in #git on Freenode.
One of the things that makes Git merge so much easier is that you can keep the merge commit commit and branch history of the new branch in sync. This means you don’t have to create new branches every time you merge a new branch.
This makes it easy to merge commits from one branch into another because you dont have to switch to your local branch and branch over the top of the new commits. You only have to do it once. Git also puts a ton of thought into making merges as painless as possible. It takes some time, but can be done.
In Git, you can merge commits from a branch into one branch, but the merge has to be done from both branches, which means you have to switch to your local branch and switch back to the branch you were working on. That is a major pain for many people, especially when it comes to merge requests. But Git knows how to deal with it. It will take you a bit of time to get used to the merge, but its worth it, since it makes pulling and merging easier.
A lot of people have been using git for years, but just don’t remember the name. Some people think git is cool, whereas others think it’s a bit complex.
