Comments (9)
Done.
from skip.
Cool, let's just disable "allow merge commits" and keep squash-merging as the default?
@jasone does that sound reasonable for now?
from skip.
@JoelMarcey could you set it if you don't mind? Thanks!
from skip.
Are you cool with "squash and merge"?
This seems to be the default right now and I actually like it. Otherwise I usually end up squashing my "mini diffs" by hand on my branch and then push -f to the pull request before merging.
So that option already does that for me :-)
If you feel strongly about it I am happy to change it.
from skip.
I don't have a strong opinion on squashing, though I tend to think it's something that we should at least be able to opt out of, so that on occasions a pull request can cleanly be broken into multiple stacked diffs, we preserve that. The thing that's bugging me is the messiness caused by merge commits. Here's part of what tig
currently shows.
We just need a slightly faster commit rate to make the commit graph inscrutable. Oh, and git bisect
gets a bit weirder to work with when merge commits are common. I can live with merge commits, but I view them as an obfuscating force.
from skip.
@jasone @vjeux @pikatchu I personally also like squash and merge, but I definitely understand the merits of rebase and merge. Just let me know which way to go here.
I can remove the option of Merge Pull Request
if we just want to start there too.
from skip.
Interesting, it sounds like there's not clear agreement on this, so let's leave things as they are for now. However, I am curious to understand what benefit you see in the merge commits. Do they provide a more detailed commit history that you find useful for some purposes?
from skip.
I can remove the option of Merge Pull Request if we just want to start there too.
@JoelMarcey Do you mean we can remove the option that creates a merge commit? Having just squash-merge and rebase-merge at least means we always keep the commit history clean. Most commits (especially from the community) are small and squashing makes sense, larger commits will likely be from maintainers and they (we) can choose rebase-merge when it makes sense.
from skip.
@josephsavona Yep, we can choose any combo.
from skip.
Related Issues (20)
- Abstract static methods on traits are too restrictive HOT 1
- sk still says "Written ..." even when the build failed
- Re-enable memoization tests
- Project file errors leads to skip_server deadlock
- if/then/else unexpected behavior
- Install via homebrew
- Incremental Compilation? HOT 4
- Website appears to be gone HOT 3
- The website is down again. HOT 2
- Create a project file for src/native
- Github Template Files HOT 4
- skip_server doesn't watch for changes in the list of files referenced by globs in skip.project.json HOT 6
- [doc website] HOT 3
- skip_server crashes when @cpp_extern is missing
- High Performance JS Backend HOT 4
- sk script needs longer ps output
- Crash of skip_server if subclass is removed
- This program should be refused, the closure is untracked
- Chars.escape is incorrect
- skip_to_native script fails with LLVM 8
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from skip.