Skip to content

Commit

Permalink
Clean up assets, images
Browse files Browse the repository at this point in the history
  • Loading branch information
Roshanjossey committed Sep 26, 2018
1 parent 298d342 commit e01a95e
Show file tree
Hide file tree
Showing 50 changed files with 41 additions and 471 deletions.
10 changes: 0 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,16 +106,6 @@ Now submit the pull request.

Soon I'll be merging all your changes into the master branch of this project. You will get a notification email once the changes have been merged.

## Delete the branch after pull request has been merged

You can safely delete your branch `<add-your-branch-name>` after the pull request has been merged. You'll see a button to delete the branch:

<img style="float: right;" src="assets/delete-branch-after-pr.png" alt="delete branch after PR is merged" />

If the Pull Request was closed without being merged, GitHub will warn you about deleting unmerged commits and the button will look like this:

<img style="float: right;" src="assets/delete-branch-warning.png" alt="delete branch after PR is not merged" />

## Where to go from here?

Congrats! You just completed the standard _fork -> clone -> edit -> PR_ workflow that you'll encounter often as a contributor!
Expand Down
Binary file removed assets/Thumbs.db
Binary file not shown.
335 changes: 0 additions & 335 deletions assets/TriangleWorkflow.svg

This file was deleted.

Binary file modified assets/compare-and-pull.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/compare-pull.png
Binary file not shown.
Binary file removed assets/delete-branch-after-pr.png
Binary file not shown.
Binary file removed assets/delete-branch-warning.png
Binary file not shown.
Binary file removed assets/resolve-conflicts.png
Binary file not shown.
Binary file added assets/submit-pull-request.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/submit-pull.png
Binary file not shown.
2 changes: 1 addition & 1 deletion github-desktop-old-version-tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ If you go to your repository on github, you'll see `Compare & pull request` but

Now submit the pull request.

<img style="float: right;" src="assets/submit-pull.png" alt="submit pull request" />
<img style="float: right;" src="assets/submit-pull-request.png" alt="submit pull request" />

Soon I'll be merging all your changes into the master branch of this project. You will get a notification email once the changes have been merged.

Expand Down
2 changes: 1 addition & 1 deletion github-desktop-tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ If you go to your repository on github, you'll see `Compare & pull request` but

Now submit the pull request.

<img style="left;" src="assets/submit-pull.png" alt="submit pull request" />
<img style="left;" src="assets/submit-pull-request.png" alt="submit pull request" />

Soon I'll be merging all your changes into the master branch of this project. You will get a notification email once the changes have been merged.

Expand Down
2 changes: 1 addition & 1 deletion github-windows-vs2017-tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ In your repo on GitHub you'll see the `Compare & pull request` button next to th

Now submit the pull request.

<img src="assets/submit-pull.png" alt="submit pull request" />
<img src="assets/submit-pull-request.png" alt="submit pull request" />

Soon I'll be merging all your changes into the master branch of this project. You will get a notification email once the changes have been merged.

Expand Down
8 changes: 2 additions & 6 deletions gitkraken-tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,7 @@ If you go to your repository on github, you'll see `Compare & pull request` but

Now submit the pull request.

<img style="float: right;" src="assets/submit-pull.png" alt="submit pull request" />

Resolve conflicts if any.

<img style="float: right;" src="assets/resolve-conflicts.png" alt="resolve conflicts" />
<img style="float: right;" src="assets/submit-pull-request.png" alt="submit pull request" />

Soon I'll be merging all your changes into the master branch of this project. You will get a notification email once the changes have been merged.

Expand Down Expand Up @@ -137,4 +133,4 @@ If you're feeling especially charitable, follow [Roshan](https://roshanjossey.gi
[Twitter](https://twitter.com/sudo__bangbang) and
[GitHub](https://github.com/roshanjossey).

<a href="http://saasgrids.com"> <img alt="http://saasgrids.com" src="assets/saasgrids-banner.png" width="500"></a>
<a href="http://saasgrids.com"> <img alt="http://saasgrids.com" src="assets/saasgrids-banner.png" width="500"></a>
Binary file removed submit-pull-request.png
Binary file not shown.
2 changes: 1 addition & 1 deletion translations/README.ar.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ git push origin "add-your-name"

<div dir="rtl">والآن سلم طلبك لتتم مراجعته </div>

<img style="float: left;" src="../assets/submit-pull.png" alt="submit pull request" />
<img style="float: left;" src="../assets/submit-pull-request.png" alt="submit pull request" />

<div dir="rtl">بعد المراجعة سوف أقوم بدمج تغيرراتك إلى الفرع الرئيس في المشروع. سيتم تنبيهك عن طريق البريد الإلكتروني بذلك.</div>

Expand Down
2 changes: 1 addition & 1 deletion translations/README.bn.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ git push origin <add-your-name>

এখন *পুল রিকোয়েস্ট* সাবমিট করুন।

<img style="float: right;" src="../assets/submit-pull.png" alt="submit pull request" />
<img style="float: right;" src="../assets/submit-pull-request.png" alt="submit pull request" />

আমি যথা শীঘ্র সম্ভব আপনার পরিবর্তনগুলো এই প্রজেক্টের মাস্টার ব্রাঞ্চে মার্জ করব। মার্জ করা সম্পন্ন হলে আপনি একটি নিশ্চিতকরণ ই-মেইল পাবেন।

Expand Down
12 changes: 1 addition & 11 deletions translations/README.ca.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,20 +98,10 @@ Si aneu al vostre respositori a GitHub, veureu un botó `Compare & pull request

Envía la *pull request*.

<img style="float: right;" src="../assets/submit-pull.png" alt="envia la pull request" />
<img style="float: right;" src="../assets/submit-pull-request.png" alt="envia la pull request" />

Aviat estaré fusionant els vostres canvis en la branca (*branch*) master d'aquest projecte. Rebreu una notificació per correu electrònic un cop els canvis hagin sigut fusionats.

## Eliminar la branca (*branch*) master després de que la *pull request* hagi estat fusionada

Podeu eliminar de forma segura la branca (*branch*) `<afegiu-el-nom-de-la-branca>` un cop la *pull request* hagi sigut fusionada. Veureu un botó per a leiminar la branca (*branch*):

<img style="float: right;" src="../assets/delete-branch-after-pr.png" alt="eliminar branch un cop PR s'ha fusionat" />

Si la *Pull Request* ha sigut tancada sense haver estat fusionada, GitHub li advertirà sobre el fet d'eliminar *commits* no fusionats i el botó es veurà així:

<img style="float: right;" src="../assets/delete-branch-warning.png" alt="eliminar branca després de que la PR no estigui fusionada" />

## On anar des d'aquí?

Enhorabona! Acabeu de completar l'estàndard flux de treball *_fork -> clone -> edit -> PR_* que trobareu sovint com a col·laborador!
Expand Down
2 changes: 1 addition & 1 deletion translations/README.chs.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ git push origin <分支的名称>

接着再点击 `Create pull request` 按钮,正式提交 pull request。

<img style="float: right;" src="../assets/submit-pull.png" alt="submit pull request" />
<img style="float: right;" src="../assets/submit-pull-request.png" alt="submit pull request" />

不久之后,我便会把你所有的变化合并到这个项目的主分支。更改合并后,你会收到电子邮件通知。

Expand Down
2 changes: 1 addition & 1 deletion translations/README.cht.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ git push origin <add-your-name>

接著再點擊 `Create pull request` 按鈕,正式提交 pull request。

<img style="float: right;" src="../assets/submit-pull.png" alt="submit pull request" />
<img style="float: right;" src="../assets/submit-pull-request.png" alt="submit pull request" />

不久之後,如果妳/你更改的文件與原本沒有衝突,我們會把所有的變化合併到這個項目的主分支。
更改合併後,妳/你會收到通知電郵。
Expand Down
2 changes: 1 addition & 1 deletion translations/README.de.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ Wenn du jetzt zu deinem Repository auf Github gehst, siehst du einen Knopf `Comp

Erstelle einen Pull Request.

<img style="float: right;" src="../assets/submit-pull.png" alt="Pull Request senden" />
<img style="float: right;" src="../assets/submit-pull-request.png" alt="Pull Request senden" />

Roshanjossey wird nun deine Änderungen in den Master Branch dieses Projekts mergen. Du erhältst eine E-Mail sobald dies geschehen ist.

Expand Down
2 changes: 1 addition & 1 deletion translations/README.eg.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ git push origin "add-your-name"

<div dir="rtl">دلوقتي هتسلم طلبك لصاحب المشروع الأساسي عشان يراجع عليه، في الحالة دي الطلب بتاعك هيوصلي. </div>

<img style="float: left;" src="../assets/submit-pull.png" alt="submit pull request" />
<img style="float: left;" src="../assets/submit-pull-request.png" alt="submit pull request" />

<div dir="rtl">بعد المراجعة هدمج تغيرراتك للفرع الرئيسي في المشروع. وهيتم تنبيهك عن طريق البريد الإلكتروني بدة.</div>

Expand Down
12 changes: 1 addition & 11 deletions translations/README.en-pirate.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,20 +111,10 @@ If ye go t' yer repository on GitHub, ye'll see a `Compare & pull request` butt

Now submit th' pull request.

<img style="float: right;" src="../assets/submit-pull.png" alt="submit pull request" />
<img style="float: right;" src="../assets/submit-pull-request.png" alt="submit pull request" />

Soon I'll be mergin' all yer changes into th' master branch o' this project. Ye will get a notification email once th' changes 'ave been merged.

## Delete th' branch aft pull request has been merged

Ye can safely scuttle yer branch `<add-yer-branch-name>` aft th' pull request has been merged. Ye'll see a button t' scuttle th' branch:

<img style="float: right;" src="../assets/delete-branch-after-pr.png" alt="delete branch after PR is merged" />

If th' Pull Request was closed without bein' merged, GitHub will warn ye about scuttlin' unmerged commits 'n th' button will look like this:

<img style="float: right;" src="../assets/delete-branch-warning.png" alt="delete branch after PR is not merged" />

## Where t' go from here?

Well done! Ye jus' completed th' standard _fork -> clone -> edit -> PR_ workflow that ye'll encounter often as a contributor!
Expand Down
12 changes: 1 addition & 11 deletions translations/README.es.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,20 +97,10 @@ Si vas a tu repositorio en GitHub, verás un botón `Compare & pull request`. Ha

Ahora envía la *pull request*.

<img style="float: right;" src="../assets/submit-pull.png" alt="enviar la pull request" />
<img style="float: right;" src="../assets/submit-pull-request.png" alt="enviar la pull request" />

Pronto estaré fusionando tus cambios (haciendo *merge*) con la rama master de este proyecto. Recibirás una notificación por correo electrónico cuando los cambios hayan sido fusionados.

## Elimina la rama (*branch*) después de que la *pull request* haya sido fusionada

Puedes eliminar de forma segura tu rama `<añade-el-nombre-de-la-rama>` después de que la *pull request* haya sido fusionada. Verás este botón para eliminar la rama:

<img style="float: right;" src="../assets/delete-branch-after-pr.png" alt="eliminar rama después de que la PR haya sido fusionada" />

Si la *Pull Request* ha sido cerrada sin ser fusionada, GitHub te alertará por intentar eliminar *commits* no sincronizados y el botón será el siguiente:

<img style="float: right;" src="../assets/delete-branch-warning.png" alt="eliminar rama después de que la PR no haya sido fusionada" />

## ¿Cuáles son los siguientes pasos?

¡Enhorabuena! ¡Has completado el flujo de trabajo *_fork -> clone -> edit -> PR_* que encontrarás habitualmente como contribuidor!
Expand Down
2 changes: 1 addition & 1 deletion translations/README.fa.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Age Beri Too Repository Roo GitHub, Dokmeye `Compare & pull request` Ro Mibini.

Hala Darkhate Pull Ro Submit Kon

<img style="float: right;" src="../assets/submit-pull.png" alt="submit pull request" />
<img style="float: right;" src="../assets/submit-pull-request.png" alt="submit pull request" />

Be Zoodi Man Tamame Taghiratet Ro Be Branche "Master" Ezafe Mikonam. Be Mahze IN Ke Taghirat Submit Shod Email Daryaft Mikoni

Expand Down
2 changes: 1 addition & 1 deletion translations/README.fa.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
وجود داره . روش کلیک کن</p>
<img style="float: left;" src="../assets/compare-and-pull.png" alt="create a pull request" />
<p dir="rtl">حالا دستور پل رو ثبت کن</p>
<img style="float: left;" src="../assets/submit-pull.png" alt="submit pull request" />
<img style="float: left;" src="../assets/submit-pull-request.png" alt="submit pull request" />
<p dir="rtl">بزودی من تمام تغیرات تو رو به شاخه اصلی این پروژه اضافه میکنم
زمانی که تغیرات ثبت شد یک ایمیل دریافت میکنی</p>
<h2 dir="rtl">
Expand Down
2 changes: 1 addition & 1 deletion translations/README.fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ Si vous visitez votre répertoire sur Github, vous verrez un bouton `Compare &

Maintenant soumettez la demande de tirage.

<img style="float: right;" src="../assets/submit-pull.png" alt="submit pull request" />
<img style="float: right;" src="../assets/submit-pull-request.png" alt="submit pull request" />

Sous peu j'aurai fusionné toutes vos modifications avec la branche master de ce projet. Vous recevrez un mail de notification dès que la fusion sera effectuée.

Expand Down
2 changes: 1 addition & 1 deletion translations/README.gl.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Se vas ó teu repositorio en GitHub, verás un botón `Compare & pull request`.

Agora crea e envía a pull request:

<img style="float: right;" src="../assets/submit-pull.png" alt="sube a pull request" />
<img style="float: right;" src="../assets/submit-pull-request.png" alt="sube a pull request" />

Axiña fusionarei os teus trocos (facendo *merge*) na master branch deste proxecto. Recibirás unha notificación por correo cando los trocos xa estean fusionados.

Expand Down
2 changes: 1 addition & 1 deletion translations/README.gr.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ git push origin <add-your-name>

Τώρα υποβάλλετε την pull request.

<img style="float: right;" src="../assets/submit-pull.png" alt="submit pull request" />
<img style="float: right;" src="../assets/submit-pull-request.png" alt="submit pull request" />

Σύντομα θα ενσωματώσω όλες τις αλλαγές σας στο master branch του προγράμματος. Θα ειδοποιηθείτε με email όταν οι αλλαγές που κάνατε ενσωματωθούν.

Expand Down
13 changes: 1 addition & 12 deletions translations/README.hb.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ git push origin <add-your-branch-name>

כעת, הגישו את בקשת הדחיפה

<img style="float: right;" src="../assets/submit-pull.png" alt="submit pull request" />
<img style="float: right;" src="../assets/submit-pull-request.png" alt="submit pull request" />

בקרוב, אני אצרף את כל השינויים לתוך הענף הראשי של פרויקט זה. אתם תקבלו עדכון במייל ברגע שהשינויים ימוזגו.
</div>
Expand All @@ -164,17 +164,6 @@ git push origin <add-your-branch-name>
<h2> מחקו את הענף שלכם אחרי שבקשת הדחיפה אושרה </h2>
</div>

<div dir="rtl">
ניתן למחוק בבטחה את הענף שלכם '<add-your-branch-name>' אחרי שבקשת הדחיפה מוזגה. אתם תראו כפתור למחיקת הענף:

<img style="float: left;" src="../assets/delete-branch-after-pr.png" alt="delete branch after PR is merged" />

אם בקשת הדחיפה נסגרה ללא מיזוג, GitHub, יזהיר אתכם לגבי מחיקת commits שלא מוזגו והכפתור יראה כך:

<img style="float: left;" src="../assets/delete-branch-warning.png" alt="delete branch after PR is not merged" />

</div>

<div dir="rtl">
<h2> מה לעשות מכאן? </h2>
</div>
Expand Down
14 changes: 2 additions & 12 deletions translations/README.hi.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,19 +98,9 @@ git push origin <अपनी-शाखा-का-नाम-जोड़ें>

अब अपनी pull request सबमिट करें|

<img style="float: right;" src="../assets/submit-pull.png" alt="submit pull request" />
<img style="float: right;" src="../assets/submit-pull-request.png" alt="submit pull request" />
जल्द ही मैं आपके बदलावों को इस प्रोजेक्ट की मास्टर शाखा में मर्ज क्र दूंगा| आपको एक मेल आजायेगी जब आपके बदलाव मर्ज होंगे|

## पुल अनुरोध मर्ज के बाद शाखा हटाएं

पुल अनुरोध मर्ज होने के बाद आप अपनी शाखा को सुरक्षित रूप से हटा सकते हैं। शाखा को हटाने के लिए आपको एक बटन दिखाई देगा:

<img style="float: right;" src="../assets/delete-branch-after-pr.png" alt="delete branch after PR is merged" />

अगर पुल अनुरोध मर्ज किए बिना बंद कर दिया गया था, तो github आपको मर्ज न किए गए कामों को हटाने के बारे में चेतावनी देगा और बटन इस तरह दिखेगा:

<img style="float: right;" src="../assets/delete-branch-warning.png" alt="delete branch after PR is not merged" />

## यहाँ से कहाँ जाएं ?

बधाई! आपने अभी पूरा कर लिया है _fork -> clone -> edit -> PR_ वर्कफ़्लो जो आप अक्सर योगदानकर्ता के रूप में सामना करेंगे!
Expand All @@ -133,4 +123,4 @@ git push origin <अपनी-शाखा-का-नाम-जोड़ें>
यदि आप विशेष रूप से धर्मार्थ महसूस कर रहे हैं, तो follow [Roshan](https://roshanjossey.github.io/) twitter और
[GitHub](https://github.com/roshanjossey) पर|

<a href="http://saasgrids.com"> <img alt="https://app.saasgrids.com" src="../assets/saasgrids-banner.png" width="500"></a>
<a href="http://saasgrids.com"> <img alt="https://app.saasgrids.com" src="../assets/saasgrids-banner.png" width="500"></a>
2 changes: 1 addition & 1 deletion translations/README.id.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ Jika anda membuka repositori anda di GitHub, maka akan ada tombol `Compare & pul

Submit pull request.

<img style="float: right;" src="../assets/submit-pull.png" alt="submit pull request" />
<img style="float: right;" src="../assets/submit-pull-request.png" alt="submit pull request" />

Suatu saat nanti saya akan melakukan penggabungan terhadap semua perubahan anda ke master cabang proyek ini. Anda akan mendapatkan email notifikasi setelah perubahan tersebut selesai digabungkan.

Expand Down
2 changes: 1 addition & 1 deletion translations/README.it.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ Se vai nella tua repository su GitHub, vedrai il pusante `Compare & pull reques

Ora invia la pull request.

<img style="float: right;" src="../assets/submit-pull.png" alt="submit pull request" />
<img style="float: right;" src="../assets/submit-pull-request.png" alt="submit pull request" />

Presto avrò incorporato (*merge*) tutti i tuoi cambiamenti nel master branch di questo progetto. Ti arriverà una mail di notifica una volta che le modiche saranno state accettate.

Expand Down
2 changes: 1 addition & 1 deletion translations/README.ja.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ GitHub上であなたのリポジトリに行くと、`Compare & pull request`

プルリクエストを作ってください:

<img style="float: right;" src="../assets/submit-pull.png" alt="submit pull request" />
<img style="float: right;" src="../assets/submit-pull-request.png" alt="submit pull request" />

すぐに私が加えられた変更をmasterブランチにマージします。マージが終了した際にはその旨のメールが送られます。

Expand Down
2 changes: 1 addition & 1 deletion translations/README.ko.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ git push origin <add-your-name>

이제 풀 요청을 제출합니다.

<img style="float: right;" src="../assets/submit-pull.png" alt="풀 요청 제출하기"
<img style="float: right;" src="../assets/submit-pull-request.png" alt="풀 요청 제출하기"
/>

이제 여러분의 변경사항을 제가 확인 후에 마스터 브랜치에 머지하게되면 알림메일을 받으실 수 있습니다.
Expand Down
2 changes: 1 addition & 1 deletion translations/README.lt.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ Eikite į savo saugyklą GitHub. Pamatysite mygtuką `Compare & pull request` (p

Dabar pateikite įtraukimo į pradinę saugyklą (pull) užklausą.

<img style="float: right;" src="../assets/submit-pull.png" alt="submit pull request" />
<img style="float: right;" src="../assets/submit-pull-request.png" alt="submit pull request" />

Netrukus projekto autorius sujungs visus jūsų šakos pakeitimus su šio projekto pagrindine šaka. Kai pakeitimai bus sujungti, gausite tai patvirtinantį el. laišką.

Expand Down
2 changes: 1 addition & 1 deletion translations/README.mm_unicode.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ git push origin <add-your-name>

အခုဆို pull request လုပ်ဖို့အဆင်သင့်ဖြစ်သွားပါပြီး။

<img style="float: right;" src="../assets/submit-pull.png" alt="submit pull request" />
<img style="float: right;" src="../assets/submit-pull-request.png" alt="submit pull request" />

သင့်ရဲ့ပြောင်းလဲမှုတေွကို ဒီ project ရဲ့ master branch မှာ ထည့်သွင်းပေးမှာဖြစ်ပါတယ်။ ဒါကြောင့် သင့်မှာ notification email ရောက်လာပါလိမ့်မယ် ဒီ project ရဲ့ master branch မှာ ထည့်သွင်းပြီးရင်ပေါ့။

Expand Down
Loading

0 comments on commit e01a95e

Please sign in to comment.