An error occurred while fetching the assigned milestone of the selected merge_request.
.github
CONTRIBUTING.md +51 -0
ISSUE_TEMPLATE.md +20 -0
additional-material
git_workflow_scenarios
Useful-links-for-further-learning.md +32 -0
additional-material.md +46 -0
amending-a-commit.md +48 -0
configuring-git.md +76 -0
keeping-your-fork-synced-with-this-repository.md +40 -0
moving-a-commit-to-a-different-branch.md +25 -0
removing-a-file.md +23 -0
removing-branch-from-your-repository.md +31 -0
resolving-merge-conflicts.md +35 -0
reverting-a-commit.md +41 -0
squashing-commits.md +86 -0
stashing-a-file.md +138 -0
undoing-a-commit.md +55 -0
translations
additional-material.id.md +46 -0
additional-material.ko.md +42 -0
additional-material.pt_br.md +46 -0
additional-material.ru.md +47 -0
additional-material.sl.md +46 -0
additional-material.ur.md +47 -0
addtional-material.cht.md +46 -0
amending-a-commit.ko.md +46 -0
amending-a-commit.pt_br.md +52 -0
amending-a-commit.ru.md +45 -0
amending-a-commit.sl.md +48 -0
amending-a-commit.ur.md +52 -0
configuring-git.ru.md +77 -0
configuring-git.sl.md +77 -0
keeping-your-fork-synced-with-this-repository.ko.md +41 -0
keeping-your-fork-synced-with-this-repository.pt_br.md +40 -0
keeping-your-fork-synced-with-this-repository.sl.md +40 -0
moving-a-commit-to-a-different-branch.hi.md +26 -0
moving-a-commit-to-a-different-branch.ko.md +28 -0
moving-a-commit-to-a-different-branch.ru.md +25 -0
moving-a-commit-to-a-different-branch.sl.md +25 -0
removing-a-file.ru.md +23 -0
removing-a-file.sl.md +23 -0
removing-a-file.ua.md +23 -0
removing-branch-from-your-repository.hi.md +32 -0
removing-branch-from-your-repository.ko.md +30 -0
removing-branch-from-your-repository.pt_br.md +31 -0
removing-branch-from-your-repository.sl.md +30 -0
resolving-merge-conflicts.ko.md +43 -0
resolving-merge-conflicts.sl.md +34 -0
reverting-a-commit.ko.md +35 -0
reverting-a-commit.sl.md +39 -0
squashing-commits.sl.md +94 -0
stashing-a-file.sl.md +137 -0
undoing-a-commit.ko.md +59 -0
undoing-a-commit.sl.md +55 -0
assets
catalan1.png +0 -0
clone.png +0 -0
compare-and-pull.png +0 -0
copy-to-clipboard.png +0 -0
dt-branch1.png +0 -0
dt-branch2.png +0 -0
dt-branch3.png +0 -0
dt-clone1.png +0 -0
dt-clone2.png +0 -0
dt-clone3.png +0 -0
dt-clone4.png +0 -0
dt-commit1.png +0 -0
dt-commit2.png +0 -0
dt-publish1.png +0 -0
dt-publish2.png +0 -0
dt-status.png +0 -0
dt-sync.png +0 -0
dt-sync2.png +0 -0
dt-sync3.png +0 -0
dt1-clonetodesktop.png +0 -0
dt1-commit1.png +0 -0
dt1-commit2.png +0 -0
dt1-create-branch-name.png +0 -0
dt1-create-branch.png +0 -0
dt1-downloaded.png +0 -0
dt1-open-githubdesktop.png +0 -0
dt1-publish1.png +0 -0
dt1-sign-in.png +0 -0
dt1-status.png +0 -0
fork.png +0 -0
git-status.png +0 -0
gk-branch.png +0 -0
gk-clone.png +0 -0
gk-commit.png +0 -0
gk-edit.png +0 -0
gk-icon.png +0 -0
gk-login.png +0 -0
gk-origin.png +0 -0
gk-push.png +0 -0
gk-stage.png +0 -0
join-slack-team.png +0 -0
pirate.png +0 -0
saasgrids-banner.png +0 -0
submit-pull-request.png +0 -0
triangle_workflow.png +0 -0
triangle_workflow.pt_br.png +0 -0
vs2017-01-clone1.png +0 -0
vs2017-02-clone2.png +0 -0
vs2017-03-clone3.png +0 -0
vs2017-04-branch1.png +0 -0
vs2017-05-branch2.png +0 -0
vs2017-06-branch3.png +0 -0
vs2017-07-branch4.png +0 -0
vs2017-08-change1.png +0 -0
vs2017-09-commit1.png +0 -0
vs2017-10-commit2.png +0 -0
vs2017-11-commit3.png +0 -0
vs2017-12-commit4.png +0 -0
vs2017-13-commit5.png +0 -0
vs2017-14-commit6.png +0 -0
vscode-2018-08-branch.png +0 -0
vscode-2018-08-changes.png +0 -0
vscode-2018-08-clone.png +0 -0
vscode-2018-08-clone1.png +0 -0
vscode-2018-08-clone2.png +0 -0
vscode-2018-08-clone3.png +0 -0
vscode-2018-08-commit.png +0 -0
vscode-2018-08-commit1.png +0 -0
vscode-2018-08-gh-auth.png +0 -0
vscode-2018-08-push.png +0 -0
translations
README.ar.md +0 -0
README.bg.md +0 -0
README.bn.md +0 -0
README.ca.md +0 -0
README.chs.md +0 -0
README.cht.md +0 -0
README.cs.md +0 -0
README.da.md +0 -0
README.de.md +0 -0
README.eg.md +0 -0
README.en-pirate.md +0 -0
README.es.md +0 -0
README.fa.en.md +0 -0
README.fa.md +0 -0
README.fr.md +0 -0
README.gl.md +0 -0
README.gr.md +0 -0
README.hb.md +0 -0
README.hi.md +0 -0
README.id.md +0 -0
README.it.md +0 -0
README.ja.md +0 -0
README.ko.md +0 -0
README.lt.md +0 -0
README.mm_unicode.md +0 -0
README.mr.md +0 -0
README.mx.md +0 -0
README.nl.md +0 -0
README.np.md +0 -0
README.pl.md +0 -0
README.pt-pt.md +0 -0
README.pt_br.md +0 -0
README.ro.md +0 -0
README.ru.md +0 -0
README.se.md +0 -0
README.sl.md +0 -0
README.slk.md +0 -0
README.te.md +0 -0
README.th.md +0 -0
README.tr.md +0 -0
README.ua.md +0 -0
README.ur.md +0 -0
README.vn.md +0 -0
Translations.md +0 -0
.gitignore +0 -0
CODE_OF_CONDUCT.md +0 -0
Contributors.md +0 -0
LICENSE +0 -0
README.md +0 -0
github-desktop-old-version-tutorial.md +0 -0
github-desktop-tutorial.md +0 -0
github-windows-vs-code-tutorial.md +0 -0
github-windows-vs2017-tutorial.md +0 -0
gitkraken-tutorial.md +0 -0
package-lock.json +0 -0
.github/CONTRIBUTING.md
0 → 100644
+ 51
- 0
.github/ISSUE_TEMPLATE.md
0 → 100644
+ 20
- 0
+ 32
- 0
This document is dedicated to all the blog posts, helpful sites, tips and tricks websites that makes our lives easier. That we refer to for all our needs, be it a beginner or an expert. This page should act as an index of all those useful links that would help everybody who is new in the open-source domain or someone who wants to learn more.
+ 46
- 0
This document is dedicated to all the blog posts, helpful sites, tips and tricks websites that makes our lives easier. That we refer to for all our needs, be it a beginner or an expert. This page should act as an index of all those useful links that would help everybody who is new in the open-source domain or someone who wants to learn more.
+ 48
- 0
+ 76
- 0
additional-material/git_workflow_scenarios/keeping-your-fork-synced-with-this-repository.md
0 → 100644
+ 40
- 0
First, the flow for a full sync should be understood, which is important. In this schema, there are 3 different repos: my public repo on Github `github.com/Roshanjossey/first-contributions/`, your fork of the repo on GitHub `github.com/Your-Name/first-contributions/` and your local machine's repo from which you are suppose to work. This kind of cooperation is typical for open source projects and called `Triangle Workflows`.
+ 25
- 0
+ 23
- 0
+ 31
- 0
+ 35
- 0
If two people have changed the same lines in the same file, or if one person decided to delete it while the other person decided to modify it, Git cannot identify which is the correct version. Git will then mark the file as having a conflict - which you'll have to resolve before you can continue your work.
You resolve a conflict by editing the file and then manually merging the parts of the file that git had trouble merging. This may mean discarding either your changes or someone else's or going ahead with a mix of the two. You will also need to delete the '<<<<<<<', '=======', and '>>>>>>>' in the file.
+ 41
- 0