I have a git ignore file, which ignores all the dll. In a ASP.NET application using visual studio 2017, default template creates a package folder and any nuget downloads are downloaded there. if this folder is not checked into a source control.

How do I configure build server like jenkins/bamboo. so that when I build a project , the required dlls get downloaded?

I just started learning git using source Tree.

I used mercurial hg workbench before and was quite comfortable with it. I usually created new feature/bug/ticket branch from the main branch to work on something. and if there were any updates to the main branch, I would pull the changes and merge the master branch into my local branch, to resolve any conflicts locally.

I imagine I can do similar in git using sourcetree. I am new to git and still reading about all the terminology around it, fetch, rebase, stash and so forth.

How would one usually achieve this in a team environment while using git.

say I'm working on a feature branch, and there is update to master branch, the one you know which will have lot of conflicts. so my idea is to do a pull on to my master branch. then merge that master branch into my local and resolve the conflicts locally .

how would i achieve this in git. do i do a pull, or fetch?
if i have uncomitted changes, do i stash my changes?

Hello, I am in the process of coming up with a git work flow for the company.

I have been looking at the classic example of a successful git strategy:  https://nvie.com/posts/a-successful-git-branching-model/

I have two questions:
1. I first wanted to confirm how everything gets started.  I take it, an empty master repository would first be created and the develop would be branched from that master branch?
2. If the company wants a QA branch in addition to all the other branches recommended in the model, my question is how is that best included so it creates less issues down the line?
 - should the qa branch be cut from the master and then develop branch cut from qa?
- should both the qa branch and the develop branches be cut from the master, with merges taking place from develop to qa as needed?

Please note, the reason they don’t prefer to have a qa branch, is to allow cherry picking of the features included in the branch from the develop branch.

Thanks for any direction you can provide..

Trying to create a build and test sequence on Microsoft VSTS.  Uploaded the Git repository from my local computer.  Build and tests run fine there.

Error I get from the build of the tests project (part 2 of the solution) is that it can't find the dll created in step 1 of the build, a .Net Standard 2.0 library.  It is obvious that the first step succeeds, but the second step (the tests) fails because the reference to the Step 1 library is not referenced correctly in the VSTS build step.

I have search Microsoft and the web for an example that will work, but nothing points to a solution to this.  I am sure it is obvious but I just don't see it.

I am using Visual Studio Community 2017 version 15.7.1

I have a solution that is part of a git repository.  What I make changes to a file; there is a red check mark and when I save; the blue lock goes back on the file.  I would like to push this project as a change up to my git repository stored on visual studio.com.  However none of the changes on this solution are recognized.

What do I need to do to reset so the changes are recognized and I can add this project to the Visual Studio Team Services site?

To develop php projects I use Netbeans IDE. Ihave the version 8.2 in the WIndows partition and the version 8.1 in the Linux partition (this is the version provided by the official Software Manager).
From Windows I have setup a git repository hosted in BitBucket: first I have created the repo in BitBucket, then I have initialized a Git repo in Netbeans and I have committed and pushed the whole project.
Then, in Linux, I have cloned the repo in Netbeans providing the url of the repo. Everything went fine: I performed commit and push from Windows, then from Linux, then from WIndows again.
The last time I tried to commit from Linux I've got an error about a corrupted object. Some investigation made me realize that the object was an avi file that for reasons I ignore had been copied in the repo (I had moved some video from another external hard drive to the one where even my project is stored: all files have been copied in the right directory but one of them, and only one, has been copied even in the repo!!).
As explained here, I tried to delete the file and finally I did it, unless it was just a ghost-file or someone put some drug in my drink :)

Once deleted the corrupted object I thought everything was fine, but Git still give me an error about another corrupted object, and this time is not a …

Hi experts,
I have a c# solution which i've always just saved onto my local harddrive. I'd like to get this into VSTS so I can 1) use git for version control and 2) use the vsts scrum board to track the project. How do I get this out of my harddrive and into VSTS? I'm using visual studio 2017

When to use Git Merge and When to use Git Rebase ?

Practical Use cases or examples when Git Merge will be useful and Git rebase will be useful.

Looking to build a internet exposed host which receives Webhooks from Github to be forwarded internally.

- What is required here, for best practice - plan to do this on a VM - so hardware is fine.
- Are there any security risks - eg. ports open?

Every time I do a remote fetch from origin master down to my local master and then merge into my local branch, my preferences file gets overwritten. In my .getignore file the .settings/ folder is excluded:

# GitIgnore for Salesforce Projects
#ignore debug folder
debug/
# Project Settings and MetaData
.project
.settings/
.metadata
build.properties
config

# Apex Log as optional
apex-scripts/log

# Eclipse specific 
salesforce.schema
Referenced Packages
bin/
tmp/
config/
*.tmp
*.bak 
local.properties
.settings
.loadpath
.classpath
*.cache

# Illuminated Cloud (IntelliJ IDEA)
IlluminatedCloud
out
.idea
*.iml

# Mavensmate
*.sublime-project
*.sublime-settings
*.sublime-workspace
mm.log

# Haoide SublimeText
.config
.deploy
.history

# OSX-specific exclusions
.[dD][sS]_[sS]tore

# The Welkin Suite specific
**/.localHistory

*.sfuo

TestCache.xml

TestsResultsCache.xml

Select all Open in new window

In my remote feature branch and remote master branch, the .gitignore file is identical and has the .settings/ folder excluded. I cannot figure out why my settings file keeps getting overwritten every time I do a remote fetch and then merge into my local branch.

How can I prevent my preferences file from getting overwritten every time I do a remote fetch from master?

Thanks.

I'm using sourcetree and there is an unstaged file stuck.

The file has actually been removed a long time ago, I don't want it anymore, however, no matter what I do, I can't remove the line from unstaged files.

I've tried remove, ignore, stop tracking etc.. and I get the same error:

git -c diff.mnemonicprefix=false -c core.quotepath=false checkout -- lib/addins/imagemagick/pclip.png
error: pathspec 'lib/addins/imagemagick/pclip.png' did not match any file(s) known to git.
Completed with errors, see above.

Select all Open in new window

I'm sure a git command will fix this, just not sure what to try

In Visual Studio, how would I add my solution explorer project to gir so I can push this to VSTS?
Every time I select 'Add to Source Control' then select Git, I get the following message

"the current solution has projects that are located outside the solution folder. there projects will not be source controlled in the git repository. to add all the projects to a single Git repository please consolidate all projects under a single folder."

How would I resolve this?