Tag: version control

why git svn clone failed when using cygwin?

git svn clone Initialized empty Git repository in /cygdrive/d/xx/test/.git/ Can’t load ‘/usr/lib/perl5/vendor_perl/5.14/i686-cygwin-threads-64int/auto/SVN/_Core/_Core.dll’ for module SVN::_Core: No such file or directory at /usr/lib/perl5/5.14/i686-cygwin-threads-64int/DynaLoader.pm line 190. at /usr/lib/perl5/vendor_perl/5.14/i686-cygwin-threads-64int/SVN/Base.pm line 59 BEGIN failed–compilation aborted at /usr/lib/perl5/vendor_perl/5.14/i686-cygwin-threads-64int/SVN/Core.pm line 5. Compilation failed in require at /usr/lib/git-core/git-svn line 41. it is confusing…

Merge branch in SourceTree

Newbie Question alert ! My requirement is to merge a whole BugFixing branch to the development. On source tree there are two options when you go in to merging . “Merge from Log” and “Merge Fetched” . What’s the correct option I should select ? Is merge from log only merge a specific commit ?

Git rebase cut from

I created a feature branch that was cut from develop. Another developer cut their feature branch from master. I want to merge my feature branch into their feature branch but it is not acceptable to take the changes from develop also. All branches have been pushed. Essentially i want my branch to have been cut […]

Stop new branch from getting old commit history in Git

I had this structure in Git develop C – D – E / master A – B Then, I added a new branch from develop with: git checkout -b new_branch develop This is what i got new_branch C – D – E – F – G / develop C – D – E It branched […]

git local branch and origin/master still diverged after git reset –hard

After doing git reset –hard I expected to see ‘HEAD is now at hexNumber’ and then ‘on branch master….nothing to commit. Instead I see wb316-mac03:MoodTrack student$ git reset –hard HEAD is now at ec11193 preparation for merge wb316-mac03:MoodTrack student$ wb316-mac03:MoodTrack student$ git status # On branch master # Your branch and ‘origin/master’ have diverged, # […]

How do I split a file in Git?

I have source file A, which is getting long and contains two large classes. I want to split it into files A and B, preserving history and “blame” data. In Subversion, this is very easy: do an svn copy A B, delete the lines from A that should only be in B and vice versa, […]

Why file at remote location is not getting updated by Git version control

I followed this How to create a remote Git repository from a local one? and this article I am trying to create a local Git repo for team of 3 developers with windows machine. After spending hours in vain, I am coming here. My Setup: I used one of my external hardisk (K: drive with […]

How to ensure commit author

When I commit a code using git, I need to inform two global variables: user.name and user.email. However, I can put any email or information, inclusive other users or a invalid name or email. How git ensures this information?

How does this workflow result in discarded work?

I was linked to this blog on another question, and I read this warning about a certain git workflow: Here’s the actual scenario that caused an enormous amount of hair pulling. The team was using the merge workflow. Lots of people changing things really fast. The typical style was Work on your stuff Commit it […]

How should I structure my git commits?

I’m trying to contribute to open source software for the first time, but I’m pretty inexperienced with version control systems. In particular, right now I want to make a number of changes to different parts of the code, but I’m not sure if the maintainer would want to integrate all of them into the master […]

Git Baby is a git and github fan, let's start git clone.