On Windows, a good 3-way diff/merge tool remains kdiff3 (WinMerge, for now, is still 2-way based, pending WinMerge3) See “How do you merge in GIT on Windows?” and this config. Update 7 years later (Aug. 2018): Artur Kędzior mentions in the comments: If you guys happen to use Visual Studio (Community Edition is free), try the tool that is shipped with it: vsDiffMerge.exe. It’s … Read more
Situation: You have local uncommitted changes You pull from the master repo You get the error “Checkout conflict with files: xy” Solution: Stage and commit (at least) the files xy Pull again If automerge is possible, everything is ok. If not, the pull merges the files and inserts the merge-conflict markers (<<<<<<, >>>>) Manually edit … Read more
fetch, merge, and pull git fetch and git merge origin/master will fetch & integrate remote changes. Let me explain a common scenario. origin/master is at C. Someone pushed D. You worked on E & F. Note that you will not see D in your local repository until you run git fetch. Now you run git fetch. Now you can see … Read more
git cherry-pick‘ should be your answer here. Apply the change introduced by an existing commit. Do not forget to read bdonlan‘s answer about the consequence of cherry-picking in this post:“Pull all commits from a branch, push specified commits to another”, where: becomes: The problem with this commit is that git considers commits to include all … Read more
The message “Already up-to-date” means that all the changes from the branch you’re trying to merge have already been merged to the branch you’re currently on. More specifically it means that the branch you’re trying to merge is a parent of your current branch. Congratulations, that’s the easiest merge you’ll ever do. 🙂 Use gitk … Read more
A single branch of another repository can be easily placed under a subdirectory retaining its history. For example: This will appear as a single commit where all files of Rails master branch are added into “rails” directory. However the commit’s title contains a reference to the old history tree: Add ‘rails/’ from commit <rev> Where <rev> is a … Read more
All you should need to do is:
I think your basic issue here is that you’re misinterpreting and/or misunderstanding what git does and why it does it. When you clone some other repository, git makes a copy of whatever is “over there”. It also takes “their” branch labels, such as master, and makes a copy of that label whose “full name” in … Read more
I’m sorry, I managed to find the answer myself using google and a bit of luck : ) For those interested; I installed the pdftk (pdf toolkit) on our debian server, and using the following command I achieved desired output: OR This in turn can be piped directly into pdf2ps.
git pull <remote> master:dev will fetch the remote/master branch and merge it into your local/dev branch. git pull <remote> dev will fetch the remote/dev branch, and merge it into your current branch. I think you said the conflicting commit is on remote/dev, so that is the branch you probably intended to fetch and merge. In … Read more