git.rinkkasatiainen.fi

Github pages - my own learning diary

Table of contents

Using Git
Add file to staging area
So, I did not run unit tests when committing to staging?
Feature Branch
Feature branch - how to fetch those
Fixing Commits
Cherry-picking commits
Do stuff for changed files
Git Rebase, my best friend
Special workflow, great success in moving stuff from SVN to GIT
Ignoring files
Merge from other remote
Pushing changes to repository
Add file to staging area
See what's changed in your project

View My GitHub Profile

Special workflow, great success in moving stuff from SVN to GIT

I had this great success.

We had stuff in SVN and then we moved those to git. While I had a bunch of local commits not pushed to SVN, I went for a holiday. And when coming back, all code was in git. What to do.

  1. set remote to git repository
  2. create new branch from feature branch described here
  3. cherry-pick commits from git-svn l_devel branch to the new git-based branch. I used –no-commit to verify things were OK. > possibly commit
  4. push to master: git push git-repository git-based-branch:master