FAQ Database Discussion Community


Does Git interfere with SVN?

git,svn,version-control
Imagine I have a SVN repository. I can commit changes to it, when they are ready. While I'm working on a particular task, I want to track my changes locally. So I thought that maybe I can just create a git repository inside the root of SVN repo. Then I...

Which git feature should I use for breaking big commit (pushed and reversed) into smaller commits?

git,version-control,commit,rollback,cherry-pick
I use Atlassian SourceTree to work with git repository. I committed and pushed big commit where desired and undesired changes were mixed. I rolled it back by committing and pushing Reverse Commit. Now I want to extract desired changes from that big commit and commit them as smaller commit or...

What is the meaning of the 'tag' in Git repository and how 'tag' works?

git,version-control,repo
I am new to Git Repository. And I don't know about 'tag'. how it works and what can we get from tag?

How do I learn the process of application development by cloning an open source project from github?

django,git,github,version-control
I've completed a ton of django tutorials and now I want to get my hands dirty. Having cloned a simple django app from github, looking at complicated project layout and numerous files, it is overwhelming. However, I can see the (oldest first) commits from the author. Is there a way...

Git: how to commit and cherry-pick bug fix? [closed]

git,version-control,git-branch
Our development team uses a dev branch for majority of commits and branch out each month for release branches. I was wondering what's the most popular model to handle bug fix commits. Commit to HEAD of monthly branch (most recent one, say 2015.Jun branch) and cherry-pick (or just rebase) to...

How can I merge my changes to a Tag in Git?

git,version-control
I am on Master Branch as seen above: koraytugay$ git branch -a EBT-7869 ebt-7911-cross-client * master And I have 5 changes but I want to merge only 2 of the files into a different tag. koraytugay$ git tag 3.1.8 3.2.0 How can I merge only 2 files (Lets say A.java...

Why these commands in mercurial create a new head?

version-control,mercurial
I was asked as an assignment to figure out which of the following lines causes the number of heads to change, now I checked and saw that lines 16 and 20 add new heads to their repository, but I'm not quite sure why.. I understand that the number is changed...

Git, how do I get the files that are 1 commit ahead from masters to another branch

git,version-control
I need some help. Currently we are working on a project. we are using git version control to version our project. for now we have 3 branches v3.4 , v3.3 and master. the master is a 246 commits ahead on v3.4 and on master some files are still identical to...

Git: revert entire repository

git,version-control
tl;dr: Revert my entire local repository to a specific point in time. I want all branches to be reverted to that point. I want all commits that came after that point in time to be completely gone. I guess a good way of depicting it would be to cut...

Get latest tag of repo

git,version-control
The tag is exist: $ git tag v4.0.0-alpha but when use describe: $ git describe --tags fatal: No tags can describe 'b42e62743a298e1dff2a686fde01319e9a75b65a'. Try --always, or create some tags. I did missing something. But what ? How to properly get latest tag of repo ?...

Hg Mercurial - Upgrading code not in repository

version-control,merge,mercurial,tortoisehg
I have a customized local repository of NopCommerce 3.5. The new version of NopCommerce (3.6) is out and I would like to try to update to it. I downloaded their source code and I would like to somehow replace all the files in my local repository with the new files...

how to “propertly” not commit changes on mercurial?

version-control,mercurial
Accidentally i hg added several binary compiled files from a project along with tons of little changes on several files. my hg status now show that i have a dozen files modified (correctly) and two dozen files added (mistake). how do i undo that? Most answers here tell me to...

Mercurial difference between changesets and revisions

version-control,mercurial
I'm new to Mercurial and trying to understand how things work. I wonder what is the difference between changesets and revisions ? Thanks....

SVN - Get all the commit messages between given two revisions and folder URL

git,bash,svn,version-control
I'm looking for a SVN command (or some bash file) that get two different revision numbers and URL to a folder and returns all the commit messages between those revision. Example: $svn getLog 9558 9583 http://someurl/projects/myProject/trunk ...

Overwrite my local changes in TortoiseSVN from latest version

java,svn,version-control,tortoisesvn
Lets say I did a check out, edited some stuff and realized I want to re-download the repository code and overwrite my local changes without commiting them. At the time of checkout file version was 100 in SVN,I done some edit and now I want to take latest version from...

How to change git repository using android studio

git,github,android-studio,version-control,repository
I'm using git with android studio and I already sync other repository. But I hope to change a git repository like github. I think I need to disconnect already connected to the repository but I don't found this option. To do that, How can I do?...

Differences between 2 branches after merge: GIT

git,version-control,merge,git-diff
I am currently working on a second branch called NC12-changePassword. There have been changes made to master branch which handle decrypting of a string. I required these new changes to be able to implement a new feature on my branch so I merged the changes. I did a git pull...

git diff and code review in common branch

git,version-control
Im using git. Say we have a common branch that multiple people are working on. A rather large change is being done, say it has 20 commits and a considerable amount of lines changed. Now say the "change" / "feature" / "fix" being done is identified with a commit-message. So...

Mercurial - abandoning loose ends

version-control,mercurial,branch,tortoisehg,branching-and-merging
Due to lack of attention, I have made a rollback ("backout") that I had forgot to merge back into the default branch - which I did not notice until a bit later, causing my local history to look like this: Which seems to disallow pushing ("new remote heads"). If I...

SVN: Adding a new branch to the “Choose items” list

svn,version-control,tortoisesvn
Apologies if this is already covered somewhere, but couldn't find an existing answer at least on a short search. I use TortoiseSVN on a repository which has very many (historical and otherwise) branches, of which I need only a few new ones. I would want to be able to update...

Bitbucket is alarming that my git repo is too large but I cannot confirm large files

git,version-control,bitbucket,bfg-repo-cleaner
Bitbucket is alarming that my Git repository is over 1 GB. Actually, in Repository details page it says it is 1.7 GB. That's crazy. I must have included large data files in the version control. My local repository is in fact 10 GB, which means that at least I have...

Git - how do I freeze a particular version of a small file, keep it in my repository, but then ignore constant minor changes to it going forward

git,github,version-control
I have a file in my source code repository that I cannot simply remove from my code base. However, this file is constantly changing in insignificant ways. When every I run my project in my dev environment this file gets touched, so my git repository always dutifully reports changes and...

git push error between two local respositories

git,version-control,git-push
I have a (main)folder 'prj' with directories and have git init there creating a repo and added and committed all files with git add * I have created another directory 'prj2' where I have git init and then did a git pull which copied everything over to 'prj2' now when...

SVN: branch issue

svn,version-control,merge,branch
I just started working with SVN. I created a dev branch for myself only, so that I can do whatever I want before merging my changes to the trunk. Unfortunately, when I had to merge, it has been a nightmare. My tree looked like that: trunk : A-B \ dev...

Git workflows with external developers [closed]

git,github,version-control,developer-tools
I’m trying to work out the best Git workflow to implement when working with external developers. Ideally, I would like to set up the initial commit and let the developers take it from there, but I would also like to ‘approve’/merge their commits. When I try to add contributors to...

I have deleted my project.pbxproj file using git checkout — . Should I delete the branch locally and pull from origin?

xcode,git,github,version-control
I have gotten myself into some hot water regarding source control. I had just gotten a feature branch to work that another developer on my team had created and developed, which required adding some files. He then added some additional code to the project, and I wanted to revert to...

Maintaining a large website [closed]

deployment,version-control
When I update a website I just replace the content with a new file. How do larger websites update their content? When thousands of visitors are viewing the site. How do example, how do Facebook or Twitter do it? Thousands of developers working and millions of visitors on the website....

Pushing only the last commit in Visual Studio 2013

git,visual-studio-2013,version-control,push
After making several local commits in VS2013, is there a way to only push the last one and discard the rest? I like to commit after making small changes but would like to push to remote server only after finishing everything.

MVC added view isn't in solution. Where is it? Possibly version control issue

asp.net-mvc,razor,version-control
This is what happened: In my controller, I made some actionresults: public ActionResult Delete(int? id) { //... } [HttpPost] [ActionName("Delete")] public ActionResult DeleteConfirmed(int id) { //... } So they're made, good stuff. But, I need a view for the first one. So, I right-click Delete, and click add view. I...

Version controlling DDL changes

sql,version-control
I'm trying to work out the best way to version changes in SQL. I know that there are products like Redgate and Microsoft's SSDT, but equally I'm wondering if a more manual process might make it easier to automate deployments. I have the following requirements Must be able to produce...

Multiple streams over single project in Git?

git,version-control,stream,git-branch
I went through blog regarding GIT best practices model. As we are going to make GIT as our major head for SCM for the upcoming projects in our organization, I have some doubts, regarding them not able to find much over internet. Our project architecture is: We have only one...

git - put files back under version control

git,version-control,bitbucket
The situation I have now is this: I took the project files from the server, unversioned, and copied them on the local machine. I did git init on it, added origin, pushed the files into the repo. Made a branch, made changes to this branch, committed, pushed them into the...

Mercurial - clone all remote branches at once

version-control,mercurial
Wondering if Mercurial while cloning the repo includes all remote branches as well? Basically I have some proprietary / not used mercurial repository with many branches. I want to clone all of them at once and make backup out of it.

Using git with Doxygen FILE_VERSION_FILTER

git,version-control,doxygen
What command would be used with git for the doxygen FILE_VERSION_FILTER? The output would preferably be the number of times that file as been revised in the repo.

Adding project directory for git

git,version-control,repository
I have a development server for my php project. The project directory is /var/www/html and i am planning to incorporating git for this development server. I have created a git user and added my local pc's public key to server's .ssh/authorized key location. My question is that where should i...

Trying to understand git upstream branch

git,github,version-control
I have a git project. The remote only have a master branch, at local I have a master and proj-structure branch. I created the proj-structure branch using 'git branch -b proj-structure'. I am currently at proj-structure branch at local, when I try to git push, the git suggests me to...

Will my branch always be created off of the master branch in Git

git,version-control
when i create a branch in Git, do i have to be on the master branch? or will it automatically create the branch from master? For example, if I'm on a branch called "branch1" and I create a branch like this: git branch branch2 git checkout branch2 will branch2 have...

PhpStorm Git folder modified color

git,version-control,phpstorm
My PhpStorm is coloring changed files when a project is under Git, I want to color the folder also so I can notice that there is a file changed under that colored folder. Thanks....

Can't switch branch: untracked working tree file because of case-insensitivity?

osx,git,version-control,branch,case-sensitive
I want to merge the develop branch into the master branch and I thougt I do something like this: git checkout master git merge --no-ff develop git tag -a 1.0.0 but on checkout I get git checkout master error: The following untracked working tree files would be overwritten by checkout:...

Mercurial - merging last three unpushed commits

version-control,merge,mercurial,commit,tortoisehg
I have (locally) three hg commits. As two of them are basically but a couple of minor corrections, I would like to merge them into a single commit prior to pushing. Any way to do that (with TortoiseHg or console)?...

How to import bugfix of master in all other branches without including the commits before?

git,version-control,merge,git-branch
I have some branches: branch 1 and branch 2. They have their origin from the master branch. Now there were some changes in the master branch. One is a critical bugfix, which has to be imported on branch 1 and 2. But there is a change (or perhaps multiple) which...

Migrating a large, divergent TFS Team Project to Git

git,version-control,tfs,git-tfs
I have a large-ish TFS team project. After battling with Git-TFS (we have some funky stuff in our TFS Team Project) I have a full local git repo. It is too big to fit into the BitBucket 1GB soft limit. The Team project contains branches that are divergent products. --...

Git: missing subdirectories after clone

git,svn,version-control,git-svn
We are in the process of switching to git for our Version Control system. I used 'git svn' to clone my current svn repository "bigproject" to a git repository - I also setup a cron to sync svn commits to this git repo. "bigproject" has no defined externals or svn:ignore...

Change from Eclipse to Android studio and vise-versa without driving VCS crazy

eclipse,svn,version-control,android-studio
I have an assignment to do for my university. We have to build an android app using eclipse and using SVN as VCS. My teacher strictly demanded Eclipse. The problem is I want to use Android Studio for my app. I do not like to be restrained. Now, the only...

Two parallel independet branches in the same repo in git

git,version-control
I am new to git and I am trying to learn some new stuff. I want to know is it possible to have two branches which are independent of each other (no common ancestor) in the same repo. Illustrative Example: Let's imagine we have a repo stored in [email protected] Under...

Visual Studio SCC API - programmatically checkout files

visual-studio-2013,version-control,visual-studio-shell
Is there a generic programmatic way to use the Visual Studio Source Control Plugin API to check out files, browse repositories and check in files? I am aware that I can use the TFS API to acheive the same results. However I would like to be able to execute source...

How can I re-merge commits that were reverted in github?

git,github,version-control,revert
I will try my best to concisely describe my current situation, and would be most grateful for some advice. I merged in a big feature branch of code this morning that turned out to have a critical error. In order to undo it, my coworker reverted the merge (which had...

Multiple MobileFirst apps in one APK

version-control,mobilefirst
We are working with a team of multiple developers in a MobileFirst project. The issue is that we have only one APK for a multi-app development. What is the best approach? Work with one APK in development on a single MobileFirst app? Work with multiple APKs on multiple MobileFirst apps,...

Versioning and Serialization

serialization,version-control,versioning,serialversionuid
So this is a question about Serialization and Versioning. I have a program that is a Music database that stores sheet music with Name, Composer, ... I serialize each song to a hidden folder so that the user can reload the database at next launch. Now, when I have to...

What goes inside “trunk” folder in SVN?

svn,version-control,naming-conventions
This is a very basic and kind of meaningless question, but nevertheless: Should I put the contents of my solution directly into the trunk directory, or in trunk/Solution? I've done a search but could not find what is the accepted "convention" for this....

One Repository or Two for new variant?

git,version-control
We have a C codebase, in maintenance mode, which supports a number of build personalities, for a given board architecture. We are launching development of generation 2 of the product, which uses a new board architecture. Generation 2 will replace generation 1 (we aren't making any more Gen 1 boards)....

How to get culprits or committers inside a Jenkins workflow with one or more SCMs

version-control,jenkins,jenkins-workflow
Is it possible to access information about committers and/or culprits of a Jenkins workflow job when checking out from one or more SCMs (either via checkout() or other SCM steps like git/svn)? The intention is to use that information to notify committers and/or culprits about the job status, for example...

Can't find default stream when rebasing development stream

version-control,clearcase,clearcase-ucm
When I go to rebase my development stream with the latest baseline, the current integration stream does not automatically show up. Instead I get a list of all the available streams. When I select the integration stream from the list, I get the following error: Because this stream has no...

Add three versions to a new git repository

git,version-control,merge,versioning,branching-and-merging
I have three different versions of a program, and now, much too late, I would like to move it into a git repository. Would it be possible to start a repository with the live environment and add the test and development environment each into a branch?...

How to create user in git using tortiosegit?

git,version-control,tortoisegit
I try to google but not manage to find the answer. I would like to ask how to create a list of username / password after creating an empty repository. I have done some research and probably here are a few clues. a) Generate public / private key instead and...

Why is '-Di' not the default for a 'p4 integrate'?

version-control,perforce
Imagine the following scenarion: we have two perforce-managed directories: trunk and branch. File1 is added to branch and then integrated to trunk File1 is renamed File2 on the branch a new File1 is added to the branch In this case, the default integrate from branch to trunk will not contain...

Is there any way to checkout the previous commit without knowing the ID? [duplicate]

git,version-control
This question already has an answer here: Git relative revision numbers 4 answers If I am going to use checkout to find bugs in my code, I think it would be helpful to be able to checkout the previous commit without having to lookup its ID with git log....

Use git-tfs with multiple Git-users

git,version-control,tfs,git-tfs
The official SCM here at work is TFS. I use git-tfs to be able to work. Other devs here at the local branch of our company use StarTeam for local development branches (yes, there are SCMs out there worse than TFS). Now, some of us thinking about migrating from StarTeam...

Amending last git commit message creates diverged feature branch version?

git,version-control
I have a feature branch and want to alter previous commit message. There I perform a command: git commit --amend It works as expected when the commit is not pushed yet and so a new commit is created and replaced with the previous one (locally). However, if the commit is...

Reverse Merge and svn:mergeinfo

svn,version-control,merge
We are using SVN to manage a development pipeline, in which we merge changes from the first stage of the development environment into a second-stage branch. We have created tools that will merge revisions from the first stage into the second stage. What we want to do is alert users...

Ignored files from .gitignore is different on each developers computer

git,version-control,gitignore
I've followed the steps here to remove all my files from git tracking and then added them back to be tracked. After running git status --ignored I could now see the files being ignored, which was what I was trying to fix. Originally, there were several files not being ignored....

EA - Obtain the `Local Project Path` directory in the project's `Version Control Settings`

javascript,version-control,jscript,enterprise-architect
Preface This relates directly to Enterprise Architect's API and its scripting capabilities and not so much with actual JScript/Javascript. Question How do you obtain the Local Project Path directory in the project's Version Control Settings using EA's scripting API? Note: [Package].XMLPath only provides the path relative to that location, which...

TFS Moving Files with history

visual-studio-2010,version-control,tfs,tfs2010
FYI, I have gone through this link - Team Foundation Server - Moving Source with History which is of different scenario Issue: We were working in a single solution with multiple projects in TFS1 before three months, but unfortunately one bad day due to the hardware issue we were not...

Place git repository on external hard drive

xcode,git,version-control,xcode6
I am using XCODE, and have recently decided to try using git (I am a lone app developer, so never really needed to use it). Because it used to take up a lot of storage space when I tried it previously, all of my current projects with git are stored...

Is there an option in SourceTree / Git to review another persons code before pushing?

git,version-control,push,verify
We use SourceTree for a project at work. Because all team members are inexperienced juniors, we see a lot of code that isn't exactly high quality. Therefore, we want to include a step that forces you to let your code check by another team member before you can push your...

How do I clone a repository from git but still get updates made to the original repo?

git,github,version-control,git-clone
I'd like to "clone" an open source application on github to configure it and make a modified version of it. I figured the cloning and changing part tho I can't seem to figure out this. How can I clone the repo, but maintain a "relation" to the original one since...

How to split a “historical” git repository?

git,version-control
I have here a rather special case: I have some old repositories in different VCSs (git,svn). I now want/have to tidy up things a bit. The goal was to migrate everything to one single VCS and we decided on git. In a first step I imported the "foreign" VCS history...

Phabricator/SVN - What's the best way to manage multiple subdirectories of a repository?

svn,version-control,phabricator
We've just started using Phabricator and are in the process of integrating our SVN repositories into the system. One repository is kind of a "mega" repository, about 4GB in size, and housing many small projects. What I would like to do is separate them out in Phabricator so that instead...

Is there a name for the merge conflict syntax Git uses?

git,version-control,tfs,dvcs,source-control-explorer
When one gets a conflict, the conflict(s) are marked in the file as: <<<<<<< HEAD <p>Once she climbed a tree and then forgot how to climb back down again</p> ======= <p>Once, forgot where her food bowl was and was hungry all day</p> >>>>>>> prequel Is there a name for this...

Unable to push or pull with Bitbucket

git,version-control,bitbucket
I'm having some issues with Bitbucket. I've been trying to get more fancy with my git usage, and managed to get some errors. First it was a merge conflict, resolved that. But ever time I do a git push i get this error: fatal: The current branch development has no...

Merge folder from one branch into another with git

git,version-control,merge,git-diff,git-cherry-pick
I'm working with two branches in a git repository. They are rc and dev. I have a folder in dev src/ that I need to merge into rc. I've tried to use git cherry-pick --strategy=recurisve --strategy-option=theirs <commit> method by first creating a shell script to add a new line to...

git - create a new branch from local copy and then merge it with existing branch

git,version-control,merge,gitlab,pull
Being a git newbie, I have messed up a little bit in the way I handled a new development and I do not succeed in resolving this properly. I have a master branch. I made a local copy of this master branch on my desktop computer and then I removed...

Switch Git branch in development server

git,version-control,merge,smartgit
I have a Git repository structured as pic shows: As you may see there is a development branch, that's the one I'm using at development server. We are working (I and them) in new functionalities so developers works at unificacion branch and I continue developing at development, in order to...

How to exclude DB connection settings from a SCMP?

sql-server,visual-studio,version-control,schema
We have a solution we use to update our database, which includes several "schema comparison" (.scmp) files. These files provide a convenient way to quickly open a tab that compares the schema of the project with the DB's schema. The trouble is, the DB connection string is embedded in the...

Newbie Unable to clone repo

version-control,bitbucket
I've never used a VCS before and I'm attempting to set one up now. I'm doing some Game Development with Unity3d. At first I googled how to set up VCS for Unity; and I found this: http://www.gamasutra.com/blogs/BurkayOzdemir/20130303/187697/Using_Unity3D_with_external_VCS_Mercurial__Bitbucket_step_to_step_guide.php I followed it until it came time to clone the repository from within...

SonarQube: Get all Issues of a particular user

version-control,sonarqube
I am able to get the name of the developer who committed the culprit line when directly viewing the file, but is it possible to get all issues of a particular developer in a central location? The email address the developer uses to log in to the system is the...

Merge branch in SourceTree

git,version-control,atlassian-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...

How to sync a repository with github?

github,version-control
I cloned a repository from GITHUB onto my local machine. And then I made a few direct commits to the GITHUB copy itself. Now I want to sync my local copy with the remote one. How should I proceed?

Should git-flow branches be available on bare repository and its clone?

git,version-control,git-flow
I am attempting to start using git-flow. I have installed and initialised git-flow on my master repository. It is all correct and shows in git.config. It is linked to a bare repository, and I/others clone the bare repository when working. However, when I clone the bare repository, the develop branch...

What TFS folder should the solution file be bound to?

visual-studio,visual-studio-2013,version-control,tfs
I'm using Visual Studio 2013 Pro, update 4, and TFS for version control. I'm not having a good time. VS keeps insisting on checking out the solution file when I open my (multi-project) solution. It also gives an error "Unspecified Error" (thanks) for every project in the solution. I had...

Android studio checkout from Version Control: Google Cloud

android-studio,version-control,gradle,google-cloud-platform
I uploaded an android studio project with VCS->Import Into Version Control->Upload Project to Google Cloud. The project is succesfully uploaded as I see it in the developer console. The promlem come when I try to Checkout it from my other pc. I select the Google Project Id and choose clone,...

Getting the revision number of the end of a branch in WinCvs

version-control,branch,versioning,cvs,wincvs
I need a CVS command that given the name of a branch, it will give you the revision number of the last file in that branch. CVS Tree structure: (filename) | +--> 1.1-----(branch) | | | 1.1.1.1 | | | 1.1.1.2 | | | 1.1.1.3 | | 1.2 | |...

Can't see contents of a file deleted from Subversion repository

svn,version-control
A while ago I deleted a file from Subversion repository and now I want to take a look at its contents. I determined that the file was deleted in revision 68, so I tried the following: svn cat -r 67 path/to/file from the project root directory, svn tells me that...

Can't change branch: merge conflict because of (already?) untracked file

git,version-control,branch,merge-conflict-resolution
I already had the problem that I couldn't check out a branch (see here). After I forced the checkout (git checkout master -f) and did the merging and tagging, I now want to switch to the develop branch back. This is what I get: git checkout develop MyProject.userprefs: needs merge...

Diff tool in SourceTree

git,version-control,atlassian-sourcetree
I am using SourceTree as a Git client in my windows 7. I faced with a conflict and in order to resolve I click on Launch external merge tool as suggested. A window pops up very shortly and nothing happens then after! I just tried it on my Mac OS...

SVN keywords config

java,linux,svn,version-control
Following my previous question I'd like to auto substitute SVN keywords when I commit from the command line. Eg /** * $LastChangedDate$ */ Will become /** * $LastChangedDate: 2006-07-22 21:42:37 -0700 (Sat, 22 Jul 2006) $ */ I have my ~/.subversion/config file as follows (note the miscellany section enable-auto-props =...

Push remote specific branches with different names

git,version-control,push
Lets say we have origin with a branch called master which would be checked out by; >> git checkout master Switched to branch 'master' Your branch is up-to-date with 'origin/master' Now I add the remote fork also with a branch called master which would be checked out by; >> git...

Manage project backend and frontend in two separate branches or repositories?

git,version-control
I started a project of a mobile app that will have a server-side and the app itself. So, in the master branch I created 2 projects myapp_server and myapp and then I created 2 other branches backend and frontend and I want to push to the separate branches only the...

TFS Migration Risks

visual-studio,version-control,tfs,tfs2010,tfs2013
I would like to create a new installation of TFS 2013 on a new server. I made my research and learnt that the migration process as it is described on this link below carries some risks: TFS Migration Manual: https://msdn.microsoft.com/en-us/library/ms404869.aspx Risks: http://blogs.msmvps.com/p3net/2014/04/12/tfs-upgrade-nightmares/ I have a plan to avoid using the...

Git: Why is only 1 merge showing in my history when I have done several?

git,version-control,merge,branch,branching-and-merging
Here is my commit history with git log --pretty=%h --graph (the order of commits goes from bottom to top) * 81e1852 <- I have merged back in twice to get to this * b6cb648 * 3ef6e0b * a1f56c5 * a35a50a * 47b2058 <- I have made a couple of branches...

Restore Git History / Repo From Local .git Folder

git,version-control
I am wondering if it is possible to restore a remote git repo from a local .git folder. And if so, how. Some back story to what happened and what I am trying to do. Recently one of my servers had a hardware failure and sadly it was what hosted...

What are the methodologies to use Version Contol System (Revision Control) in a team project? [closed]

git,svn,version-control,team-project
Just in case I make mistakes, sorry for my English :). I am trying to learn how to use VCS in a big team project, what are the different approaches to it. Can you help me find information about that, because all I find is just a description of functions...

How can I commit/push changes to a “live” branch and then keep working on my “test/dev” branch?

version-control,mercurial,tortoisehg,revert
I'm very new to working on larger projects and using any form of version control, so please bear with me. I have a project running on a local/intranet webserver. I'm using mercurial for version control with hgworkbench/turtoisehg as a GUI. So far I've simply commited and pushed my changes to...

Checkout a complete Subversion tree excluding tags/ and branches/

bash,svn,version-control,cmd,branch
I'm working on a corporate source code tree that contains 100s of Maven sub-projects. Since each sub-project has its own layout of branches/ and tags/ sub-folders, the entire tree is laid out something like this: root/ some/intermediate/dirs/ project1/ branches/ ... tags/ ... trunk/ ... project2/ branches/ ... tags/ ... trunk/...

Best practice for data version control in sql and c#

c#,sql,version-control,sqlanywhere,revision-history
In this question i want to figureout, what is the best practice to control versions of data in sql. We are useing a relational database (Sybase SAP Sql Anywhere). The problem is, we don't know in which layer of our software we should implement a version control system. We want...

Trying to push the changes in github but getting error

git,github,version-control
! [rejected] master -> master (fetch first) error: failed to push some refs to 'https://github.com/dvtta/pinter.git' hint: Updates were rejected because the remote contains work that you do hint: not have locally. This is usually caused by another repository pushing hint: to the same ref. You may want to first integrate...

How does one move a file erroneously added to a branch / commit to a different branch / commit in Git?

git,version-control,git-branch-sculpting
I have a file (driver_06_05_2015.view) in branch ServiceProvisionSpecialist_06_08_2015 that shouldn't be there and was mistakenly committed to that branch even though it should be in the driver_06_05_2015 branch. Is there a way I can move just the file (not the entire commit) to the driver_06_05_2015 branch by rewriting history...

Easy way to switch/swap git checkins between 2 branches

git,version-control,merge,branch
I made an implementation for a feature on develop-branch. It worked out well but then I came up with an interesting alternative. I branched from the checkin of develop-branch before the feature checkin on develop to implement the alternative. Now I decided that my alternative is the better implementation. But...

How sync work using git-flow

git,version-control,git-flow
I and my co-worker are working to a project. There is a --bare remote repo from which we have cloned to our pc. Then we have both initialized own personal repos with git-flow. Now I have develop and master branch. Which branch shoult I use to sync my work with...

Is there a non-REST version control API to Visual Studio Online?

version-control,visual-studio-online
I'm looking at whether we can migrate our old on-premises TFS 2010 server to Visual Studio Online. We all have MSDN subscriptions so it looks promising. But we have an app we wrote to keep our SQL scripts in version control. The app uses the old Microsoft.TeamFoundation.Client & Microsoft.TeamFoundation.VersionControl.Client object...