Getting Started with Adobe After Effects - Part 6: Motion Blur


Upload Image Close it
Select File

Code Inside blog
Browse by Tags · View All
Uncategorized 53
Twitter 1
ASP.NET 1

Archive · View All
December 2011 5
September 2012 4
March 2012 4
February 2012 4
January 2012 4
March 2013 3
January 2013 3
November 2012 3
October 2012 3
July 2012 3

Git-Pull Request mergen for beginners

Feb 19 2012 12:00AM by Code Inside Blog   

image1450-570x194

My project “KnowYourStack.com” (the working title was BizzBingo – a detailed blogpost will follow soon) lays on GitHub and I’ve recognized a Problem where Daniel Lang helped me a lot. At the end he created a Fork for my Project and laid a Pull Request:

image

The question is: How do I transfer the changes to me?

Because I’m a totally beginner in Git/GitHub I’m going to write it down step by step. The help page on GitHub was a good introduction but at last I need to merge several files during this action which makes this a lot more complicated.

git checkout master
...
git pull https://github.com/dlang/BizzBingo master
... (VIELE DATEIEN werden gezogen)...

Result:

“Automatic merge failed: fix conflicts and then commit the result.”

$ git mergetool

Beware: Before you start make sure you already created a Mergetool. It’s not that difficult and you will find a detailed instruction here. In fact all you have to do is to choose a Merge Program (I’ve chosen KDiff3 but it’s ugly). And after that you need to tell Git which tool is the right one for the mergen process. At the end that’s what the .gitconfig looks like:

 

[/diff]

	tool = kdiff3

[merge]

	tool = kdiff3

[mergetool "kdiff3"]

	path = C:/Program Files (x86)/KDiff3/kdiff3.exe

    keepBackup = false

    trustExitCode = false

[difftool "kdiff3"]

    path = C:/Program Files (x86)/KDiff3/kdiff3.exe

    keepBackup = false

    trustExitCode = false

After that the files will merge to GitHub with “commit” and “push”. That’s it. Smiley

I think that will work – Thanks again Daniel Smiley


Republished from Code-Inside Blog International [7 clicks].  Read the original version here [1 clicks].

Code Inside Blog
625 · 0% · 57
1
 
0
Lifesaver
 
0
Refreshed
 
0
Learned
 
0
Incorrect



Submit

Your Comment


Sign Up or Login to post a comment.

"Git-Pull Request mergen for beginners" rated 5 out of 5 by 1 readers
Git-Pull Request mergen for beginners , 5.0 out of 5 based on 1 ratings
    Copyright © Rivera Informatic Private Ltd Contact us      Privacy Policy      Terms of use      Report Abuse      Advertising      [ZULU1097]