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.
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.
As a project manager, I have discovered that different developers want to bring their previous branching method with them when they join the team. Some developers are used to performing individual wo...
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!
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