Skip to content
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.

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

Add a little 'how to contribute' #10

Closed
Janmm14 opened this issue May 31, 2016 · 16 comments
Closed

Add a little 'how to contribute' #10

Janmm14 opened this issue May 31, 2016 · 16 comments

Comments

@Janmm14
Copy link
Contributor

Janmm14 commented May 31, 2016

Well, to ease things up for contributors, it might be an idea of adding a little help.

This makes discussions like in #7 another little easier to win 😄

@sgdc3
Copy link
Contributor

sgdc3 commented May 31, 2016

It would be better ;)

@Techcable Techcable mentioned this issue May 31, 2016
Closed
@Techcable
Copy link
Contributor

I vote we base it of the Paper/TacoSpigot Contributing.md that I wroke.

@Janmm14
Copy link
Contributor Author

Janmm14 commented Jun 1, 2016

Why not?

@Leymooo
Copy link

Leymooo commented Jun 10, 2016

Can someone make video how to make this patches?

@Janmm14
Copy link
Contributor Author

Janmm14 commented Jun 10, 2016

@Dimatert9 You can create patches by running ./rebuildPatches.sh (in git shell from 'Git for Windows').

Patches are based on commits in the BungeeCord submodule (patches to commits: use ./applyPatches.sh).

@Leymooo
Copy link

Leymooo commented Jun 10, 2016

I dont know how work with git shell. Video can help for a lot of peoples.

@ConnorLinfoot
Copy link

@Dimatert9 It's really not that tough. All you need to do is install "Git for Windows" as mentioned and then when you right click in a folder you'll see an option to "Git Bash Here" and that's when you run your commands.

@camdenorrb
Copy link

It's alot harder for Intellij users to use Version control.

@minecrafter
Copy link
Contributor

Nope.

Source: IntelliJ user

@camdenorrb
Copy link

Mind if you tell me your steps then?

@Janmm14
Copy link
Contributor Author

Janmm14 commented Jun 20, 2016

@camdenorrb If you just use the git of intellij, you can't build waterfall. Same goes for every other IDE's git implementation.

@fuzzybot
Copy link
Contributor

I agree with Techcable's vote... I was able to get up to speed on patch based contributions from that Contributing doc in a matter of minutes without needing to ask anybody any questions.

@phase
Copy link
Contributor

phase commented Jun 29, 2016

Just copy Paper's and s/Paper/Waterfall.

@jamierocks
Copy link
Contributor

2fc007f

@Leymooo
Copy link

Leymooo commented Jul 13, 2016

How to resolve conflicts after submodule update?

@phase
Copy link
Contributor

phase commented Jul 13, 2016

# If you dont  want to save your changes
git fetch origin master
git reset --hard origin/master
# If you want to keep your commits
git pull --rebate

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

10 participants