Skip to content

Commit 2e4440c

Browse files
beardofedubeardofedu
committed
add helper
1 parent 52f504c commit 2e4440c

15 files changed

+16
-1
lines changed

‎paths/merge-conflict/00-intro.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ layout: simple-class
33
header:
44
overlay_image: cover.jpeg
55
overlay_filter: rgba(46, 129, 200, 0.6)
6+
help: https://github.com/githubtraining/on-demand-merge-conflict/issues/new?title=I%20need%20help&body=Describe%20what%20you%20need%20help%20with%20here.&labels=Help%20Wanted
67
title: Managing Merge Conflicts
78
permalink: /merge-conflicts/
89
next-page: /merge-conflicts/setup/

‎paths/merge-conflict/01-normal-merge.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ layout: simple-class
33
header:
44
overlay_image: cover.jpeg
55
overlay_filter: rgba(46, 129, 200, 0.6)
6+
help: https://github.com/githubtraining/on-demand-merge-conflict/issues/new?title=I%20need%20help&body=Describe%20what%20you%20need%20help%20with%20here.&labels=Help%20Wanted
67
title: A Normal Merge
78
permalink: /merge-conflicts/normal-merge/
89
next-page: /merge-conflicts/mc-description/

‎paths/merge-conflict/02-mc-desc.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ layout: simple-class
33
header:
44
overlay_image: cover.jpeg
55
overlay_filter: rgba(46, 129, 200, 0.6)
6+
help: https://github.com/githubtraining/on-demand-merge-conflict/issues/new?title=I%20need%20help&body=Describe%20what%20you%20need%20help%20with%20here.&labels=Help%20Wanted
67
title: Merge Conflict Description
78
permalink: /merge-conflicts/mc-description/
89
next-page: /merge-conflicts/first-conflict/

‎paths/merge-conflict/02-setup-repository.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ layout: simple-class
33
header:
44
overlay_image: cover.jpeg
55
overlay_filter: rgba(46, 129, 200, 0.6)
6+
help: https://github.com/githubtraining/on-demand-merge-conflict/issues/new?title=I%20need%20help&body=Describe%20what%20you%20need%20help%20with%20here.&labels=Help%20Wanted
67
title: Set Up the Repository
78
permalink: /merge-conflicts/setup/
89
next-page: /merge-conflicts/normal-merge/

‎paths/merge-conflict/02-your-first-conflict.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ layout: simple-class
33
header:
44
overlay_image: cover.jpeg
55
overlay_filter: rgba(46, 129, 200, 0.6)
6+
help: https://github.com/githubtraining/on-demand-merge-conflict/issues/new?title=I%20need%20help&body=Describe%20what%20you%20need%20help%20with%20here.&labels=Help%20Wanted
67
title: Your First Conflict
78
permalink: /merge-conflicts/first-conflict/
89
next-page: /merge-conflicts/example-01/

‎paths/merge-conflict/04-ex-01.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ layout: simple-class
33
header:
44
overlay_image: cover.jpeg
55
overlay_filter: rgba(46, 129, 200, 0.6)
6+
help: https://github.com/githubtraining/on-demand-merge-conflict/issues/new?title=I%20need%20help&body=Describe%20what%20you%20need%20help%20with%20here.&labels=Help%20Wanted
67
title: Skatetocat's Simple Conflict
78
permalink: /merge-conflicts/example-01/
89
next-page: /merge-conflicts/example-02/

‎paths/merge-conflict/05-ex-02.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ layout: simple-class
33
header:
44
overlay_image: cover.jpeg
55
overlay_filter: rgba(46, 129, 200, 0.6)
6-
title: Shoptocat and Supportocat Help
6+
help: https://github.com/githubtraining/on-demand-merge-conflict/issues/new?title=I%20need%20help&body=Describe%20what%20you%20need%20help%20with%20here.&labels=Help%20Wanted
7+
title: Shoptocat and Supportcat Help
78
permalink: /merge-conflicts/example-02/
89
next-page: /merge-conflicts/example-03/
910
sidebar:

‎paths/merge-conflict/06-ex-03.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ layout: simple-class
33
header:
44
overlay_image: cover.jpeg
55
overlay_filter: rgba(46, 129, 200, 0.6)
6+
help: https://github.com/githubtraining/on-demand-merge-conflict/issues/new?title=I%20need%20help&body=Describe%20what%20you%20need%20help%20with%20here.&labels=Help%20Wanted
67
title: Momtocat and Poptocat Lend a Hand
78
permalink: /merge-conflicts/example-03/
89
next-page: /merge-conflicts/what-next/

‎paths/merge-conflict/07-ide-intro.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ layout: simple-class
33
header:
44
overlay_image: cover.jpeg
55
overlay_filter: rgba(46, 129, 200, 0.6)
6+
help: https://github.com/githubtraining/on-demand-merge-conflict/issues/new?title=I%20need%20help&body=Describe%20what%20you%20need%20help%20with%20here.&labels=Help%20Wanted
67
title: Using GUIs to Handle Merge Conflicts
78
permalink: /merge-conflicts/ide-intro/
89
sidebar:

‎paths/merge-conflict/08-ide-atom.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ layout: simple-class
33
header:
44
overlay_image: cover.jpeg
55
overlay_filter: rgba(46, 129, 200, 0.6)
6+
help: https://github.com/githubtraining/on-demand-merge-conflict/issues/new?title=I%20need%20help&body=Describe%20what%20you%20need%20help%20with%20here.&labels=Help%20Wanted
67
title: Atom
78
permalink: /merge-conflicts/ide-atom/
89
next-page: /merge-conflicts/ide-intro/

‎paths/merge-conflict/09-ide-vs-ext.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ layout: simple-class
33
header:
44
overlay_image: cover.jpeg
55
overlay_filter: rgba(46, 129, 200, 0.6)
6+
help: https://github.com/githubtraining/on-demand-merge-conflict/issues/new?title=I%20need%20help&body=Describe%20what%20you%20need%20help%20with%20here.&labels=Help%20Wanted
67
title: GitHub Extension for Visual Studio
78
permalink: /merge-conflicts/ide-vs-ext/
89
next-page: /merge-conflicts/ide-intro/

‎paths/merge-conflict/10-ide-eclipse.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ layout: simple-class
33
header:
44
overlay_image: cover.jpeg
55
overlay_filter: rgba(46, 129, 200, 0.6)
6+
help: https://github.com/githubtraining/on-demand-merge-conflict/issues/new?title=I%20need%20help&body=Describe%20what%20you%20need%20help%20with%20here.&labels=Help%20Wanted
67
title: IDE Eclipse
78
permalink: /merge-conflicts/ide-eclipse
89
next-page: /merge-conflicts/what-next

‎paths/merge-conflict/11-ide-vs-code.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ layout: simple-class
33
header:
44
overlay_image: cover.jpeg
55
overlay_filter: rgba(46, 129, 200, 0.6)
6+
help: https://github.com/githubtraining/on-demand-merge-conflict/issues/new?title=I%20need%20help&body=Describe%20what%20you%20need%20help%20with%20here.&labels=Help%20Wanted
67
title: Visual Studio Code
78
permalink: /merge-conflicts/ide-vs-code/
89
next-page: /merge-conflicts/ide-intro/

‎paths/merge-conflict/12-ide-gh-desktop.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ layout: simple-class
33
header:
44
overlay_image: cover.jpeg
55
overlay_filter: rgba(46, 129, 200, 0.6)
6+
help: https://github.com/githubtraining/on-demand-merge-conflict/issues/new?title=I%20need%20help&body=Describe%20what%20you%20need%20help%20with%20here.&labels=Help%20Wanted
67
title: IDE GH Desktop
78
permalink: /merge-conflicts/ide-gh-desktop
89
next-page: /merge-conflicts/ide-vs-ext

‎paths/merge-conflict/13-what-next.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ layout: simple-class
33
header:
44
overlay_image: cover.jpeg
55
overlay_filter: rgba(46, 129, 200, 0.6)
6+
help: https://github.com/githubtraining/on-demand-merge-conflict/issues/new?title=I%20need%20help&body=Describe%20what%20you%20need%20help%20with%20here.&labels=Help%20Wanted
67
title: What Next?
78
permalink: /merge-conflicts/what-next/
89
next-page: /merge-conflicts/ide-intro/

0 commit comments

Comments
 (0)