search

korvinos / django-fun

0 stars 0 forks source link

Branches #13

Closed korvinos closed 7 years ago

korvinos commented 7 years ago

If you have questions or bugs with git branches just use this chat

docs: https://git-scm.com/docs/git-branch CIA tutorial: https://wikileaks.org/ciav7p1/cms/space_1736707.html a popular model of code development with git: https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow

ingrih commented 7 years ago

Here's one I found: https://backlog.com/git-tutorial/en/stepup/stepup1_1.html

AlfaAli commented 7 years ago

Great I created and push a develop branch called devel_Alfa as described here: https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow

ingrih commented 7 years ago

I have made a branch for me and Artem too.

In general: New branch: _git branch _ Move to branch: _git checkout _ Add to GitHub: _git push origin _ After changing a file: git add <...> git commit -am 'text...' Going back to master-branch to merge: git checkout master git merge <...> If the file has been changed in several branches and we try to merge more than one of those edits into master we will get conflict. -> must be handled manually, then git add <...> and commit.

AlfaAli commented 7 years ago

wher are you meeting? Im looking for you

On 10 Nov 2017, at 13:38, ingrih notifications@github.com wrote:

Closed #13 https://github.com/korvinos/django-fun/issues/13.

— You are receiving this because you commented. Reply to this email directly, view it on GitHub https://github.com/korvinos/django-fun/issues/13#event-1335974985, or mute the thread https://github.com/notifications/unsubscribe-auth/AYJZ4RuoIX4ObURIPvESx6QkGqEpS4A4ks5s1EPLgaJpZM4QX5Mn.