Skip to content

3 resolving merge conflicts with GitHub forks 1 #454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
ers34 wants to merge 83 commits into
base: main
Choose a base branch
from
Open

3 resolving merge conflicts with GitHub forks 1 #454

ers34 wants to merge 83 commits into from

Conversation

@ers34
Copy link

@ers34 ers34 commented Feb 25, 2023

No description provided.

ers34 and others added 30 commits February 17, 2023 14:14
@ers34
Update issue templates
2eb18cf 
Add correct labels to each issue template (3)
@ers34
Merge pull request #1 from ers34/ers34-patch-1
4e6bd45 
Update issue templates
@chwicklund
Update things-i-don-t-understand.md
d073b86
@chwicklund
Update things-i-don-t-understand.md
a87d610
@chwicklund
Update things-i-learned.md
484b112
@chwicklund
Update things-i-want-to-know.md
4a85750
@chwicklund
Update things-i-learned.md
af02b14
@chwicklund
Task: edited list
c7a7758
@chwicklund
Merge pull request #11 from chwicklund/1-git-stash
6c4c396 
Task: edited list
@chwicklund
Resolving merge conflicts on fork
494517e
@chwicklund
Merge pull request #12 from chwicklund/2-resolving-merge
efdffb3 
Resolving merge conflicts on fork
@chwicklund
#3 Difference between Docker container and Docker repository
63c2d42
@chwicklund
Merge pull request #13 from chwicklund/3-docker-diff
91a1c55 
#3 Difference between Docker container and Docker repository
Closes #3
@chwicklund
#4 How to host a website on Oracle Cloud from a Github repo
3c77e0a
@chwicklund
Merge pull request #14 from chwicklund/4-how-to-host
52f8095 
#4 How to host a website on Oracle Cloud from a Github repo
Closes #4
@chwicklund
#5 Increasing security on web server/web page
75b6610
@chwicklund
Merge pull request #15 from chwicklund/5-security
5c7ebb7 
#5 Increasing security on web server/web page
Closes #5
@chwicklund
#6 Customizing parameters of docker-compose files
9c53540
@chwicklund
Merge pull request #16 from chwicklund/6-customizing
b5dea19 
#6 Customizing parameters of docker-compose files
Closes #6
@chwicklund
#7 Linux Directory Navigation
f582615
@chwicklund
Merge pull request #17 from chwicklund/7-linux
347efed 
#7 Linux Directory Navigation
Closes #7
@chwicklund
#8 Running Docker Compose
3c5c061
@chwicklund
Merge pull request #18 from chwicklund/8-running
62f6c52 
#8 Running Docker Compose
Closes #8
@chwicklund
#9 Installing NPM
b58d6d1
@chwicklund
Merge pull request #19 from chwicklund/9-npm
5dc1fc9 
#9 Installing NPM
Closes #9
@ers34
Update issue templates (add master list label)
d30ebbd
@ers34
Merge pull request #2 from ers34/ers34-patch-2
2dfe36a 
Update issue templates (add master list label)
added first 'do not understand' item to list
d7bcb4b
@ers34
Merge pull request #4 from ers34/3-resolving-merge-conflicts-with-git…
dbdf82d 
…hub-forks-1 closes #3

added first 'do not understand' item to list
add second 'don't understand' item to list
8b560ff
ers34 and others added 30 commits February 24, 2023 22:41
@ers34
Merge branch 'main' into 5-security
771330a
@ers34
Merge pull request #25 from chwicklund/5-security
8cc6af9 
#5 security
@ers34
Merge branch 'main' into 6-customizing
562ce63
@ers34
Merge pull request #26 from chwicklund/6-customizing
8e5f82f 
#6 customizing
@ers34
Merge branch 'main' into 7-linux
5dc9cd4
@ers34
Merge pull request #27 from chwicklund/7-linux
1b66fc1 
#7 linux
@ers34
Merge branch 'main' into 8-running
f09ebf1
@ers34
Merge pull request #28 from chwicklund/8-running
5392a5b 
#8 running
@ers34
Merge branch 'main' into 9-npm
b8afcb8
@ers34
Merge pull request #29 from chwicklund/9-npm
1d52340 
#9 npm
@ers34
Revert "#9 npm"
0272c06
@ers34
Merge pull request #30 from ers34/revert-29-9-npm
bac17d9 
Revert "#9 npm"
@ers34
Revert "#8 running"
b58ccb9
@ers34
Merge pull request #31 from ers34/revert-28-8-running
d28e6e9 
Revert "#8 running"
@ers34
Revert "#7 linux"
271aed0
@ers34
Merge pull request #32 from ers34/revert-27-7-linux
9318e50 
Revert "#7 linux"
@ers34
Revert "#6 customizing"
03fbdc8
@ers34
Merge pull request #33 from ers34/revert-26-6-customizing
ab02730 
Revert "#6 customizing"
@ers34
Revert "#5 security"
1ed74ae
@ers34
Merge pull request #34 from ers34/revert-25-5-security
5c84af7 
Revert "#5 security"
@ers34
Revert "#4 how to host"
9790e24
@ers34
Merge pull request #35 from ers34/revert-24-4-how-to-host
99f779b 
Revert "#4 how to host"
@ers34
Revert "#3 docker diff"
346fc70
@ers34
Merge pull request #36 from ers34/revert-23-3-docker-diff
3900854 
Revert "#3 docker diff"
@ers34
Revert "#2 resolving merge"
1950491
@ers34
Merge pull request #37 from ers34/revert-22-2-resolving-merge
59a33aa 
Revert "#2 resolving merge"
@ers34
Revert "#1 git stash"
6c49e80
@ers34
Merge pull request #38 from ers34/revert-21-1-git-stash
d4a9d63 
Revert "#1 git stash"
@chwicklund
Merge branch 'main' into 3-resolving-merge-conflicts-with-github-forks-1
d8443b9
@ers34
Merge branch 'main' into 3-resolving-merge-conflicts-with-github-forks-1
787b418
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@ers34 @chwicklund