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

Debian package generation #14

Open
wants to merge 13 commits into
base: master
Choose a base branch
from

Conversation

KP2048
Copy link
Contributor

@KP2048 KP2048 commented Dec 3, 2020

No description provided.

@KP2048 KP2048 changed the title Debian package generation Debian package generation and added motor project Dec 3, 2020
@KP2048 KP2048 closed this Dec 3, 2020
@KP2048 KP2048 reopened this Dec 3, 2020
@KP2048
Copy link
Contributor Author

KP2048 commented Dec 3, 2020

wrong one

@KP2048 KP2048 requested a review from rofl0r December 3, 2020 20:05
@KP2048
Copy link
Contributor Author

KP2048 commented Dec 3, 2020

It’s finished

@rofl0r
Copy link
Owner

rofl0r commented Dec 4, 2020

well, this PR is a mess. please make a new one that adds only the motor motor project in a single, clean commit, and another one for whatever this current PR does too.
i'd really recommend you to install gitk, tig, or another local git gui so you can actually see what your PRs contain and the diff hunks each commit adds.

@KP2048
Copy link
Contributor Author

KP2048 commented Dec 4, 2020

Ok

@KP2048
Copy link
Contributor Author

KP2048 commented Dec 4, 2020

the problem is the commit for debian packaging also edits files in the motor project so splitting them would be hard

@KP2048
Copy link
Contributor Author

KP2048 commented Dec 4, 2020

CONFLICT (modify/delete): motor.motor deleted in HEAD and modified in df88741... added debian package generation. Version df88741... added debian package generation of motor.motor left in tree.
CONFLICT (modify/delete): Makefile.func deleted in HEAD and modified in df88741... added debian package generation. Version df88741... added debian package generation of Makefile.func left in tree.
error: could not apply df88741... added debian package generation
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

@KP2048 KP2048 changed the title Debian package generation and added motor project Debian package generation and added Dec 4, 2020
@KP2048 KP2048 changed the title Debian package generation and added Debian package generation Dec 4, 2020
@KP2048
Copy link
Contributor Author

KP2048 commented Dec 4, 2020

Try now

@@ -1,6 +1,6 @@
#
# Motor IDE functional Makefile template
# for terminal program in C++
# for terminal program in C++
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

your editor seems to automatically convert tabs into spaces. this causes a lot of unnecessary whitespace noise (check rest of the diff)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Vscode does that

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i don't care who does it, but i care not to merge random whitespace changes :)
it's your task to fix it up (and check whether this behaviour can be disabled in your editor)

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

Successfully merging this pull request may close these issues.

2 participants