Tag Archives: git

GIT merge status

If you are merging/cherry-picking changes frequently between GIT branches it's very useful to know exactly what changes were already merged, what changes are waiting for merge and for wchich change there will be a conflict during merge. This information should … Continue reading

Posted in en | Tagged , | Comments Off on GIT merge status

Perforce -> GIT import

I've been assigned recently a task to prepare development process for two teams that are working on separate version control systems (GIT and Perforce in my case). One of important parts of this task is to create effective method of … Continue reading

Posted in en | Tagged , , | Comments Off on Perforce -> GIT import

GIT: Automatic source code version information

Supporting releases: It's very important to know exact version used by customer. In order to reproduce the error you have to switch to codebase used for reported release and analyse the problem. If you have fixed release cycles it's pretty … Continue reading

Posted in en | Tagged , | Comments Off on GIT: Automatic source code version information

GIT: importing remote branches

GIT is a fast version control system that handles branching very efficiently and allow for most operations to be done offline (is a distributed VCS). Of course sometimes you have to exchange code with external GIT repos (maybe central storage). … Continue reading

Posted in en | Tagged , | Comments Off on GIT: importing remote branches

"git cherry-pick" for Perforce

Cherry-picking is a technique of porting only selected commits from one branch to another. It's directly supported in GIT by special command: git cherry-pick <SHA-COMMIT-ID> Also SVN has simple merge mode that supports selecting of single commit: svn merge -c … Continue reading

Posted in en | Tagged , , | Comments Off on "git cherry-pick" for Perforce