Made a mess and Azure does not like me

Untitled.png

 

Hi Folks,

I am new to Git. Picked up an existing system and tied it up in knots.  I have been able to publish my content through to Azure from VS2013 webdev but want to use Git and source tree. This tree has an older origin/master and origin/head which are no longer connected. Azure will now not take a connection to bitucket. 

Should I merge the origin/master back into the primary branch or can I remove it from the the git repository and have the connection taken up by master only.

Thank you

 

1 answer

I don't see any mess in your screenshot. It appears to be a typical and correct state for a repository being worked on by multiple developers.

Someone did some work and pushed it to Bitbucket. In the meantime, you've made some local commits. All you need to do is Pull, and Git will merge those together so you can push. If there are conflicts, you'll need to manually resolve those, which is also typical, not a crisis.

Make sure to finish and Commit any work in your local repository before you Pull/Push.

Also, I don't have any idea what Azure is, or what it has to do with Bitbucket.

Suggest an answer

Log in or Join to answer
Community showcase
Piotr Plewa
Published Dec 27, 2017 in Bitbucket

Recipe: Deploying AWS Lambda functions with Bitbucket Pipelines

Bitbucket Pipelines helps me manage and automate a number of serverless deployments to AWS Lambda and this is how I do it. I'm building Node.js Lambda functions using node-lambda&nbsp...

658 views 0 4
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot