Git-SVN: Update Git repo from centralized SVN server

Best way to work on a Subversion Repository via Git: git svn init -s https://svn.repo/app/ myrepo assuming that under https://svn.repo/app/ the repo contains the standard /trunk, branches and tags subdirectories Do a git svn fetch in myrepo until no more commits are fetched (may take quite some time and sometimes aborts under Windows). Checkout a … Read more

How to configure “git pull –ff-only” and “git merge –no-ff”

That shouldn’t be the case, according to the git-config man page on pull.ff: (…) When set to only, only such fast-forward merges are allowed (equivalent to giving the –ff-only option from the command line). This setting overrides merge.ff when pulling. The configuration pull.ff has been introduced in Git 2.x, so it won’t work as expected … Read more

Merging Issues with Git

Do this: git merge –abort git pull (to be sure you’re up-to-date) Now replace the contents of the file with what you want it to say. If you don’t want it at all, do git rm Then if you replaced the contents, commit and push those contents with: git add git commit … Read more

Git pull from someone else’s fork

Add a new remote (say, other) in your own repo. Pull other/<branch> changes into your local branch (say, add-other-changes). Push to your own forked repo (origin/add-other-changes). Now, when’re you done with add-other-changes branch, create a Pull request & merge it with origin/master. Pull other repo’s changes into your own repo: # go into your own … Read more