Using Git, GitHub, and SourceTree

Using Windows and can't login?

If you’re using Windows and you’re having log-in problems using git/sourcetree and none of the above fixes it, open a terminal window by pressing the Terminal button in the top right corner of SourceTree and enter the command

git config --system --unset credential.helper

and then enter

git push origin master

https://confluence.atlassian.com/bitbucket/tutorials-755338051.html

GIT COLLABORATION PROCESS

1. Commit and push your work on [your branch]
2. Right-click on your remote in the left sidebar, select "Fetch"
3. Right-click on [REMOTE]/master, select "Merge [REMOTE]/master into [your branch]"
4. Merge Conflicts may appear! Click on the merge conflicts and resolve them... you usually need to pick between the version in [your branch] or the version on [remote/master].
5. Make sure the merge-commit is finished, and then push [your branch]
6. Create a new Pull Request on GitHub.com
7. Ask a group member to review your PR. NEVER APPROVE YOUR OWN PR!!!