You need to update your local master branch. Do the following steps: git checkout master git pull origin master git checkout << your branch >> git merge master After you execute the 4th command, you will get merge conflicts. Resolve them and then do: git commit
This is one of those questions that unfortunately doesn’t have a single answer – it depends. The easiest solution is always to have a single repository. This avoids many of the problems of managing multiple repositories with different versions. But this only really works if you have a single version of everything; it’s almost impossible … Read more
I just disabled SSL certificate checks (which is fine for internal repos): Sourcetree > Preferences > Git > Disable SSL certificate validation (ticked)
You might have a session to BitBucket open in a browser, that gives the impression that everything is fine. Simply logout and in again, when logging in you need to solve a CAPTCHA, after that you are good to go.
ex-Stash developer here. Yes and no. Creating the branch though the UI is just a convenience. The important thing is that the name contains the JIRA key. If only one developer is working on the branch, it’s fairly easy to just rename (delete + add) a branch with the appropriate name. git checkout old-branch git … Read more
Pull requests are a simple concept that originated when Git was created but has been taken to different levels since. The essence is that you do not have push rights to the repository you want to contribute on, so instead you fork the repository, making your private copy (a clone already does this btw.) and … Read more